summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediffJunio C Hamano2018-08-141-21/+61
|\
| * format-patch: allow --interdiff to apply to a lone-patchEric Sunshine2018-07-231-3/+5
| * interdiff: teach show_interdiff() to indent interdiffEric Sunshine2018-07-231-1/+1
| * format-patch: teach --interdiff to respect -v/--reroll-countEric Sunshine2018-07-231-1/+16
| * format-patch: add --interdiff option to embed diff in cover letterEric Sunshine2018-07-231-2/+22
| * format-patch: allow additional generated content in make_cover_letter()Eric Sunshine2018-07-231-20/+23
* | range-diff: make --dual-color the default modeJohannes Schindelin2018-08-131-4/+6
* | range-diff: offer to dual-color the diffsJohannes Schindelin2018-08-131-0/+8
* | range-diff: suppress the diff headersJohannes Schindelin2018-08-131-0/+1
* | range-diff: indent the diffs just like tbdiffJohannes Schindelin2018-08-131-0/+10
* | range-diff: also show the diff between patchesJohannes Schindelin2018-08-131-2/+29
* | range-diff: first rudimentary implementationJohannes Schindelin2018-08-131-1/+44
* | Introduce `range-diff` to compare iterations of a topic branchJohannes Schindelin2018-08-131-0/+25
* | Merge branch 'jt/commit-graph-per-object-store'Junio C Hamano2018-08-022-1/+3
|\ \
| * | commit-graph: add repo arg to graph readersJonathan Tan2018-07-171-1/+1
| * | commit-graph: add free_commit_graphJonathan Tan2018-07-171-0/+2
| * | Merge branch 'ds/commit-graph-fsck' into jt/commit-graph-per-object-storeJunio C Hamano2018-07-173-31/+95
| |\ \
* | \ \ Merge branch 'en/dirty-merge-fixes'Junio C Hamano2018-08-021-3/+4
|\ \ \ \
| * | | | merge-recursive: fix assumption that head tree being merged is HEADElijah Newren2018-07-111-3/+4
| * | | | index_has_changes(): avoid assuming operating on the_indexElijah Newren2018-07-031-3/+3
* | | | | Merge branch 'js/rebase-merge-octopus'Junio C Hamano2018-08-021-0/+32
|\ \ \ \ \
| * | | | | merge: allow reading the merge commit message from a fileJohannes Schindelin2018-07-111-0/+32
* | | | | | Merge branch 'tb/grep-only-matching'Junio C Hamano2018-08-021-0/+6
|\ \ \ \ \ \
| * | | | | | grep.c: teach 'git grep --only-matching'Taylor Blau2018-07-091-0/+6
* | | | | | | Merge branch 'kg/gc-auto-windows-workaround'Junio C Hamano2018-08-021-0/+1
|\ \ \ \ \ \ \
| * | | | | | | gc --auto: release pack files before auto packingKim Gybels2018-07-091-0/+1
* | | | | | | | Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano2018-08-024-23/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | block alloc: add lifecycle APIs for cache_entry structsJameson Miller2018-07-034-23/+19
| * | | | | | | | read-cache: teach make_cache_entry to take object_idJameson Miller2018-07-033-4/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'jt/fetch-nego-tip'Junio C Hamano2018-08-021-0/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | fetch-pack: support negotiation tip whitelistJonathan Tan2018-07-031-0/+43
* | | | | | | | | Merge branch 'sb/object-store-lookup'Junio C Hamano2018-08-0232-94/+139
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | tag: add repository argument to deref_tagStefan Beller2018-06-294-4/+7
| * | | | | | | | tag: add repository argument to parse_tag_bufferStefan Beller2018-06-291-1/+1
| * | | | | | | | tag: add repository argument to lookup_tagStefan Beller2018-06-293-5/+5
| * | | | | | | | commit: add repository argument to lookup_commitStefan Beller2018-06-297-7/+12
| * | | | | | | | commit: add repository argument to lookup_commit_referenceStefan Beller2018-06-2913-26/+36
| * | | | | | | | commit: add repository argument to lookup_commit_reference_gentlyStefan Beller2018-06-295-13/+20
| * | | | | | | | tree: add repository argument to lookup_treeStefan Beller2018-06-294-5/+8
| * | | | | | | | blob: add repository argument to lookup_blobStefan Beller2018-06-295-5/+7
| * | | | | | | | object: add repository argument to object_as_typeStefan Beller2018-06-291-1/+1
| * | | | | | | | object: add repository argument to parse_object_bufferStefan Beller2018-06-294-5/+11
| * | | | | | | | object: add repository argument to lookup_objectStefan Beller2018-06-295-7/+10
| * | | | | | | | object: add repository argument to parse_objectStefan Beller2018-06-2910-16/+22
| * | | | | | | | Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-2934-51/+81
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'is/parsing-line-range'Junio C Hamano2018-08-021-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blame: prevent error if range ends past end of fileIsabella Stephens2018-06-151-2/+2
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ab/checkout-default-remote'Junio C Hamano2018-08-022-10/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout & worktree: introduce checkout.defaultRemoteÆvar Arnfjörð Bjarmason2018-06-111-3/+9
| * | | | | | | | | checkout: add advice for ambiguous "checkout <branch>"Ævar Arnfjörð Bjarmason2018-06-111-0/+13