summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/object-store-lookup'Junio C Hamano2018-08-0382-361/+487
|\
| * commit.c: allow lookup_commit_reference to handle arbitrary repositoriesStefan Beller2018-06-292-5/+4
| * commit.c: allow lookup_commit_reference_gently to handle arbitrary repositoriesStefan Beller2018-06-292-7/+5
| * tag.c: allow deref_tag to handle arbitrary repositoriesStefan Beller2018-06-292-5/+3
| * object.c: allow parse_object to handle arbitrary repositoriesStefan Beller2018-06-292-9/+8
| * object.c: allow parse_object_buffer to handle arbitrary repositoriesStefan Beller2018-06-292-11/+10
| * commit.c: allow get_cached_commit_buffer to handle arbitrary repositoriesStefan Beller2018-06-292-4/+3
| * commit.c: allow set_commit_buffer to handle arbitrary repositoriesStefan Beller2018-06-292-4/+3
| * commit.c: migrate the commit buffer to the parsed object storeStefan Beller2018-06-294-6/+36
| * commit-slabs: remove realloc counter outside of slab structStefan Beller2018-06-291-3/+0
| * commit.c: allow parse_commit_buffer to handle arbitrary repositoriesStefan Beller2018-06-292-7/+6
| * tag: allow parse_tag_buffer to handle arbitrary repositoriesStefan Beller2018-06-292-7/+6
| * tag: allow lookup_tag to handle arbitrary repositoriesStefan Beller2018-06-292-7/+6
| * commit: allow lookup_commit to handle arbitrary repositoriesStefan Beller2018-06-292-7/+6
| * tree: allow lookup_tree to handle arbitrary repositoriesStefan Beller2018-06-292-7/+6
| * blob: allow lookup_blob to handle arbitrary repositoriesStefan Beller2018-06-292-7/+6
| * object: allow lookup_object to handle arbitrary repositoriesStefan Beller2018-06-292-10/+8
| * object: allow object_as_type to handle arbitrary repositoriesStefan Beller2018-06-292-4/+3
| * tag: add repository argument to deref_tagStefan Beller2018-06-2918-26/+42
| * tag: add repository argument to parse_tag_bufferStefan Beller2018-06-296-7/+8
| * tag: add repository argument to lookup_tagStefan Beller2018-06-298-12/+12
| * commit: add repository argument to get_cached_commit_bufferStefan Beller2018-06-294-5/+6
| * commit: add repository argument to set_commit_bufferStefan Beller2018-06-294-5/+6
| * commit: add repository argument to parse_commit_bufferStefan Beller2018-06-294-5/+6
| * commit: add repository argument to lookup_commitStefan Beller2018-06-2919-33/+46
| * commit: add repository argument to lookup_commit_referenceStefan Beller2018-06-2927-51/+65
| * commit: add repository argument to lookup_commit_reference_gentlyStefan Beller2018-06-2920-38/+59
| * tree: add repository argument to lookup_treeStefan Beller2018-06-2919-24/+31
| * blob: add repository argument to lookup_blobStefan Beller2018-06-2915-18/+23
| * object: add repository argument to object_as_typeStefan Beller2018-06-298-9/+10
| * object: add repository argument to parse_object_bufferStefan Beller2018-06-297-9/+18
| * object: add repository argument to lookup_objectStefan Beller2018-06-2915-26/+31
| * object: add repository argument to parse_objectStefan Beller2018-06-2933-72/+95
| * Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-2995-328/+463
| |\
* | \ Merge branch 'is/parsing-line-range'Junio C Hamano2018-08-036-14/+17
|\ \ \
| * | | log: prevent error if line range ends past end of fileIsabella Stephens2018-06-152-5/+4
| * | | blame: prevent error if range ends past end of fileIsabella Stephens2018-06-154-9/+13
* | | | Merge branch 'jt/fetch-pack-negotiator'Junio C Hamano2018-08-038-169/+373
|\ \ \ \
| * | | | fetch-pack: introduce negotiator APIJonathan Tan2018-06-157-167/+292
| * | | | fetch-pack: move common check and marking togetherJonathan Tan2018-06-151-2/+4
| * | | | fetch-pack: make negotiation-related vars localJonathan Tan2018-06-151-47/+69
| * | | | fetch-pack: use ref adv. to prune "have" sentJonathan Tan2018-06-152-3/+36
| * | | | fetch-pack: directly end negotiation if ACK readyJonathan Tan2018-06-151-4/+5
| * | | | fetch-pack: clear marks before re-markingJonathan Tan2018-06-141-3/+3
| * | | | fetch-pack: split up everything_local()Jonathan Tan2018-06-141-9/+30
* | | | | Merge branch 'ab/checkout-default-remote'Junio C Hamano2018-08-0311-16/+197
|\ \ \ \ \
| * | | | | checkout & worktree: introduce checkout.defaultRemoteÆvar Arnfjörð Bjarmason2018-06-117-7/+109
| * | | | | checkout: add advice for ambiguous "checkout <branch>"Ævar Arnfjörð Bjarmason2018-06-115-0/+37
| * | | | | builtin/checkout.c: use "ret" variable for returnÆvar Arnfjörð Bjarmason2018-06-111-3/+5
| * | | | | checkout: pass the "num_matches" up to callersÆvar Arnfjörð Bjarmason2018-06-114-7/+15