]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 08221e3) | patch
mergetool: honor diff.orderFile
authorDavid Aguilar <davvid@gmail.com>
Fri, 7 Oct 2016 23:58:05 +0000 (16:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Oct 2016 17:04:27 +0000 (10:04 -0700)
commit57937f70a09c12ef484c290865dac4066d207c9c
treed44cb9e278c3e42c2f0fa3b446ff021e8512f722tree | snapshot
parent08221e3fa27396aca30cb539f006f78636782951commit | diff
mergetool: honor diff.orderFile

Teach mergetool to get the list of files to edit via `diff` so that we
gain support for diff.orderFile.

Suggested-by: Luis Gutierrez <luisgutz@gmail.com>
Helped-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-mergetool.txt diff | blob | blame | history
git-mergetool.sh diff | blob | blame | history
t/t7610-mergetool.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.