diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-25 17:11:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-25 17:11:43 -0700 |
| commit | b988427918c767fc7782a387c9c8de9e147b983d (patch) | |
| tree | 4828e30bcbaae1c5c683bea9506c08a55911c6ff /diff.c | |
| parent | The fifth batch (diff) | |
| parent | diff: support ^! for merges (diff) | |
| download | git-b988427918c767fc7782a387c9c8de9e147b983d.tar.gz git-b988427918c767fc7782a387c9c8de9e147b983d.zip | |
Merge branch 'rs/diff-caret-bang-with-parents'
"git diff rev^!" did not show combined diff to go to the rev from
its parents.
* rs/diff-caret-bang-with-parents:
diff: support ^! for merges
revisions.txt: unspecify order of resolved parts of ^!
revision: use strtol_i() for exclude_parent
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions