git.ipfire.org Git - thirdparty/git.git/commit

]> git.ipfire.org Git - thirdparty/git.git/commit

projects / thirdparty / git.git / commit

author	Junio C Hamano <gitster@pobox.com>
	Wed, 15 May 2024 16:52:54 +0000 (09:52 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 15 May 2024 16:52:54 +0000 (09:52 -0700)
commit	068df18c90c335ebe28bda285e742a6408eec3b5
tree	f40261ce76b81d8cdbce26bab8c8633d417acaad	tree
parent	3fc99d037f10dcce9c1f5e5723ebbf9fc7f1e897	commit \| diff
parent	11be65cfa43416219e85384a3a80d672b65b76ba	commit \| diff

Merge branch 'rs/external-diff-with-exit-code'

The "--exit-code" option of "git diff" command learned to work with
the "--ext-diff" option.

* rs/external-diff-with-exit-code:
diff: fix --exit-code with external diff
diff: report unmerged paths as changes in run_diff_cmd()

diff.c	diff1 \|	diff2 \|	blob \| history
t/t4020-diff-external.sh	diff1 \|	diff2 \|	blob \| history
t/t4046-diff-unmerged.sh	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

diff.c	diff1 \|	diff2 \|	blob \| history
t/t4020-diff-external.sh	diff1 \|	diff2 \|	blob \| history
t/t4046-diff-unmerged.sh	diff1 \|	diff2 \|	blob \| history