]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/config/format.txt
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 76bb189 85a9a63)
Merge branch 'jk/diff-external-with-no-index'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Feb 2024 22:31:20 +0000 (14:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Feb 2024 22:31:21 +0000 (14:31 -0800)
commit92e69dfb66fa5c760e2d1f76c8a21cdb6faacaee
treeb61fcfdac9f500306608721c8958bda767b6d281tree | snapshot
parent76bb1896de15c8d358e5adad298c90cafa98aaf5commit | diff
parent85a9a63c9268b18b24f25f6a14d6ae9966c3566dcommit | diff
Merge branch 'jk/diff-external-with-no-index'

"git diff --no-index file1 file2" segfaulted while invoking the
external diff driver, which has been corrected.

* jk/diff-external-with-no-index:
  diff: handle NULL meta-info when spawning external diff
diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.