summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sg/overlong-progress-fix'Junio C Hamano2019-04-252-22/+54
|\
| * progress: break too long progress bar linesSZEDER Gábor2019-04-151-3/+24
| * progress: clear previous progress update dynamicallySZEDER Gábor2019-04-151-4/+7
| * progress: assemble percentage and counters in a strbuf before printingSZEDER Gábor2019-04-051-12/+23
| * progress: make display_progress() return voidSZEDER Gábor2019-04-052-9/+6
* | Merge branch 'jt/batch-fetch-blobs-in-diff'Junio C Hamano2019-04-255-9/+154
|\ \
| * | diff: batch fetching of missing blobsJonathan Tan2019-04-082-0/+137
| * | sha1-file: support OBJECT_INFO_FOR_PREFETCHJonathan Tan2019-04-013-9/+17
* | | Merge branch 'ab/gc-docs'Junio C Hamano2019-04-253-101/+86
|\ \ \
| * | | gc docs: remove incorrect reference to gc.auto=0Ævar Arnfjörð Bjarmason2019-04-081-2/+1
| * | | gc docs: clarify that "gc" doesn't throw away referenced objectsÆvar Arnfjörð Bjarmason2019-04-081-2/+2
| * | | gc docs: note "gc --aggressive" in "fast-import"Ævar Arnfjörð Bjarmason2019-04-081-0/+7
| * | | gc docs: downplay the usefulness of --aggressiveÆvar Arnfjörð Bjarmason2019-04-081-2/+27
| * | | gc docs: note how --aggressive impacts --window & --depthÆvar Arnfjörð Bjarmason2019-04-081-2/+4
| * | | gc docs: fix formatting for "gc.writeCommitGraph"Ævar Arnfjörð Bjarmason2019-04-081-2/+2
| * | | gc docs: re-flow the "gc.*" section in "config"Ævar Arnfjörð Bjarmason2019-04-081-9/+8
| * | | gc docs: include the "gc.*" section from "config" in "gc"Ævar Arnfjörð Bjarmason2019-04-082-80/+35
| * | | gc docs: clean grammar for "gc.bigPackThreshold"Ævar Arnfjörð Bjarmason2019-03-241-2/+2
| * | | gc docs: stop noting "repack" flagsÆvar Arnfjörð Bjarmason2019-03-241-3/+2
| * | | gc docs: modernize the advice for manually running "gc"Ævar Arnfjörð Bjarmason2019-03-241-11/+10
| |/ /
* | | Merge branch 'dl/submodule-set-branch'Junio C Hamano2019-04-256-13/+200
|\ \ \
| * | | submodule: teach set-branch subcommandDenton Liu2019-04-104-5/+175
| * | | submodule--helper: teach config subcommand --unsetDenton Liu2019-02-082-5/+21
| * | | git-submodule.txt: "--branch <branch>" option defaults to 'master'Denton Liu2019-02-071-3/+4
* | | | Merge branch 'jk/revision-rewritten-parents-in-prio-queue'Junio C Hamano2019-04-252-22/+54
|\ \ \ \
| * | | | revision: use a prio_queue to hold rewritten parentsJeff King2019-04-042-22/+54
| | |_|/ | |/| |
* | | | Merge branch 'dk/blame-keep-origin-blob'Junio C Hamano2019-04-251-1/+2
|\ \ \ \
| * | | | blame.c: don't drop origin blobs as eagerlyDavid Kastrup2019-04-031-1/+2
| |/ / /
* | | | Merge branch 'bc/hash-transition-16'Junio C Hamano2019-04-2537-289/+362
|\ \ \ \
| * | | | gitweb: make hash size independentbrian m. carlson2019-04-011-30/+67
| * | | | Git.pm: make hash size independentbrian m. carlson2019-04-011-1/+1
| * | | | read-cache: read data in a hash-independent waybrian m. carlson2019-04-011-45/+29
| * | | | dir: make untracked cache extension hash size independentbrian m. carlson2019-04-011-14/+14
| * | | | builtin/difftool: use parse_oid_hexbrian m. carlson2019-04-011-6/+4
| * | | | refspec: make hash size independentbrian m. carlson2019-04-011-1/+1
| * | | | archive: convert struct archiver_args to object_idbrian m. carlson2019-04-014-13/+14
| * | | | builtin/get-tar-commit-id: make hash size independentbrian m. carlson2019-04-011-1/+2
| * | | | get-tar-commit-id: parse comment recordRene Scharfe2019-04-011-2/+11
| * | | | hash: add a function to lookup hash algorithm by lengthbrian m. carlson2019-04-012-0/+10
| * | | | remote-curl: make hash size independentbrian m. carlson2019-04-011-5/+6
| * | | | http: replace sha1_to_hexbrian m. carlson2019-04-011-6/+6
| * | | | http: compute hash of downloaded objects using the_hash_algobrian m. carlson2019-04-012-6/+6
| * | | | http: replace hard-coded constant with the_hash_algobrian m. carlson2019-04-011-1/+1
| * | | | http-walker: replace sha1_to_hexbrian m. carlson2019-04-011-9/+9
| * | | | http-push: remove remaining uses of sha1_to_hexbrian m. carlson2019-04-011-4/+4
| * | | | http-backend: allow 64-character hex namesbrian m. carlson2019-04-011-0/+3
| * | | | http-push: convert to use the_hash_algobrian m. carlson2019-04-011-10/+10
| * | | | builtin/pull: make hash-size independentbrian m. carlson2019-04-011-5/+6
| * | | | builtin/am: make hash size independentbrian m. carlson2019-04-011-4/+5
| * | | | fast-import: replace sha1_to_hexbrian m. carlson2019-04-011-2/+2