]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 20d451c 5f46e61)
Merge branch 'ct/diff-with-merge-base-clarification' into master
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Jul 2020 21:00:43 +0000 (14:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Jul 2020 21:00:43 +0000 (14:00 -0700)
commit46be023084bd6ce4958f16427da7cdaf91cff205
tree2986f28c116c2a6eaf96f551968e1a878abfde97tree | snapshot
parent20d451c4dab4e41efb315a4c7f9d1eb2d83c4fc5commit | diff
parent5f46e610cb43496612d7ec030d142b6b8515399dcommit | diff
Merge branch 'ct/diff-with-merge-base-clarification' into master

Recent update to "git diff" meant as a code clean-up introduced a
bug in its error handling code, which has been corrected.

* ct/diff-with-merge-base-clarification:
  diff: check for merge bases before assigning sym->base
builtin/diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.