]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
builtin/diff.c patch | diff1 | diff2 | blob | history

diff --cc builtin/diff.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.