Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff | Junio C Hamano | 2018-08-14 | 1 | -21/+61 |
|\ | |||||
| * | format-patch: allow --interdiff to apply to a lone-patch | Eric Sunshine | 2018-07-23 | 1 | -3/+5 |
| * | interdiff: teach show_interdiff() to indent interdiff | Eric Sunshine | 2018-07-23 | 1 | -1/+1 |
| * | format-patch: teach --interdiff to respect -v/--reroll-count | Eric Sunshine | 2018-07-23 | 1 | -1/+16 |
| * | format-patch: add --interdiff option to embed diff in cover letter | Eric Sunshine | 2018-07-23 | 1 | -2/+22 |
| * | format-patch: allow additional generated content in make_cover_letter() | Eric Sunshine | 2018-07-23 | 1 | -20/+23 |
* | | range-diff: make --dual-color the default mode | Johannes Schindelin | 2018-08-13 | 1 | -4/+6 |
* | | range-diff: offer to dual-color the diffs | Johannes Schindelin | 2018-08-13 | 1 | -0/+8 |
* | | range-diff: suppress the diff headers | Johannes Schindelin | 2018-08-13 | 1 | -0/+1 |
* | | range-diff: indent the diffs just like tbdiff | Johannes Schindelin | 2018-08-13 | 1 | -0/+10 |
* | | range-diff: also show the diff between patches | Johannes Schindelin | 2018-08-13 | 1 | -2/+29 |
* | | range-diff: first rudimentary implementation | Johannes Schindelin | 2018-08-13 | 1 | -1/+44 |
* | | Introduce `range-diff` to compare iterations of a topic branch | Johannes Schindelin | 2018-08-13 | 1 | -0/+25 |
* | | Merge branch 'jt/commit-graph-per-object-store' | Junio C Hamano | 2018-08-02 | 2 | -1/+3 |
|\ \ | |||||
| * | | commit-graph: add repo arg to graph readers | Jonathan Tan | 2018-07-17 | 1 | -1/+1 |
| * | | commit-graph: add free_commit_graph | Jonathan Tan | 2018-07-17 | 1 | -0/+2 |
| * | | Merge branch 'ds/commit-graph-fsck' into jt/commit-graph-per-object-store | Junio C Hamano | 2018-07-17 | 3 | -31/+95 |
| |\ \ | |||||
* | \ \ | Merge branch 'en/dirty-merge-fixes' | Junio C Hamano | 2018-08-02 | 1 | -3/+4 |
|\ \ \ \ | |||||
| * | | | | merge-recursive: fix assumption that head tree being merged is HEAD | Elijah Newren | 2018-07-11 | 1 | -3/+4 |
| * | | | | index_has_changes(): avoid assuming operating on the_index | Elijah Newren | 2018-07-03 | 1 | -3/+3 |
* | | | | | Merge branch 'js/rebase-merge-octopus' | Junio C Hamano | 2018-08-02 | 1 | -0/+32 |
|\ \ \ \ \ | |||||
| * | | | | | merge: allow reading the merge commit message from a file | Johannes Schindelin | 2018-07-11 | 1 | -0/+32 |
* | | | | | | Merge branch 'tb/grep-only-matching' | Junio C Hamano | 2018-08-02 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | grep.c: teach 'git grep --only-matching' | Taylor Blau | 2018-07-09 | 1 | -0/+6 |
* | | | | | | | Merge branch 'kg/gc-auto-windows-workaround' | Junio C Hamano | 2018-08-02 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | gc --auto: release pack files before auto packing | Kim Gybels | 2018-07-09 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'jm/cache-entry-from-mem-pool' | Junio C Hamano | 2018-08-02 | 4 | -23/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | block alloc: add lifecycle APIs for cache_entry structs | Jameson Miller | 2018-07-03 | 4 | -23/+19 |
| * | | | | | | | | read-cache: teach make_cache_entry to take object_id | Jameson Miller | 2018-07-03 | 3 | -4/+4 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jt/fetch-nego-tip' | Junio C Hamano | 2018-08-02 | 1 | -0/+43 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fetch-pack: support negotiation tip whitelist | Jonathan Tan | 2018-07-03 | 1 | -0/+43 |
* | | | | | | | | | Merge branch 'sb/object-store-lookup' | Junio C Hamano | 2018-08-02 | 32 | -94/+139 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | tag: add repository argument to deref_tag | Stefan Beller | 2018-06-29 | 4 | -4/+7 |
| * | | | | | | | | tag: add repository argument to parse_tag_buffer | Stefan Beller | 2018-06-29 | 1 | -1/+1 |
| * | | | | | | | | tag: add repository argument to lookup_tag | Stefan Beller | 2018-06-29 | 3 | -5/+5 |
| * | | | | | | | | commit: add repository argument to lookup_commit | Stefan Beller | 2018-06-29 | 7 | -7/+12 |
| * | | | | | | | | commit: add repository argument to lookup_commit_reference | Stefan Beller | 2018-06-29 | 13 | -26/+36 |
| * | | | | | | | | commit: add repository argument to lookup_commit_reference_gently | Stefan Beller | 2018-06-29 | 5 | -13/+20 |
| * | | | | | | | | tree: add repository argument to lookup_tree | Stefan Beller | 2018-06-29 | 4 | -5/+8 |
| * | | | | | | | | blob: add repository argument to lookup_blob | Stefan Beller | 2018-06-29 | 5 | -5/+7 |
| * | | | | | | | | object: add repository argument to object_as_type | Stefan Beller | 2018-06-29 | 1 | -1/+1 |
| * | | | | | | | | object: add repository argument to parse_object_buffer | Stefan Beller | 2018-06-29 | 4 | -5/+11 |
| * | | | | | | | | object: add repository argument to lookup_object | Stefan Beller | 2018-06-29 | 5 | -7/+10 |
| * | | | | | | | | object: add repository argument to parse_object | Stefan Beller | 2018-06-29 | 10 | -16/+22 |
| * | | | | | | | | Merge branch 'sb/object-store-grafts' into sb/object-store-lookup | Junio C Hamano | 2018-06-29 | 34 | -51/+81 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'is/parsing-line-range' | Junio C Hamano | 2018-08-02 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | blame: prevent error if range ends past end of file | Isabella Stephens | 2018-06-15 | 1 | -2/+2 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ab/checkout-default-remote' | Junio C Hamano | 2018-08-02 | 2 | -10/+35 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | checkout & worktree: introduce checkout.defaultRemote | Ævar Arnfjörð Bjarmason | 2018-06-11 | 1 | -3/+9 |
| * | | | | | | | | | checkout: add advice for ambiguous "checkout <branch>" | Ævar Arnfjörð Bjarmason | 2018-06-11 | 1 | -0/+13 |