]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b32f5b6 4adceb5)
Merge branch 'ar/diff-index-merge-base-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Oct 2023 21:18:28 +0000 (14:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Oct 2023 21:18:28 +0000 (14:18 -0700)
commit09dcbb486d964b59222136dd1668023098658eda
tree55dcbe81f5b84e32861d8391a1ca08c64a264af5tree | snapshot
parentb32f5b6b34a2062e94d546c923e3bcb97aba4a16commit | diff
parent4adceb5a299164aad1ef9794cdcbdb232ab10299commit | diff
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
diff-lib.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.