| commit | 09dcbb486d964b59222136dd1668023098658eda | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 Oct 2023 21:18:28 +0000 (13 14:18 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 Oct 2023 21:18:28 +0000 (13 14:18 -0700) | ||
| tree | 55dcbe81f5b84e32861d8391a1ca08c64a264af5 | treesnapshot (tar.gz zip) |
| parent | b32f5b6b34a2062e94d546c923e3bcb97aba4a16 | commitdiff |
| parent | 4adceb5a299164aad1ef9794cdcbdb232ab10299 | commitdiff |
Merge branch 'ar/diff-index-merge-base-fix'
"git diff --merge-base X other args..." insisted that X must be a
commit and errored out when given an annotated tag that peels to a
commit, but we only need it to be a committish. This has been
corrected.
* ar/diff-index-merge-base-fix:
diff: fix --merge-base with annotated tags
"git diff --merge-base X other args..." insisted that X must be a
commit and errored out when given an annotated tag that peels to a
commit, but we only need it to be a committish. This has been
corrected.
* ar/diff-index-merge-base-fix:
diff: fix --merge-base with annotated tags
| diff-lib.c | diff1 | diff2 | blobhistory |