]> git.ipfire.org Git - thirdparty/git.git/commit - git-mergetool.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 57937f7) | patch
mergetool: honor -O<orderfile>
authorDavid Aguilar <davvid@gmail.com>
Sat, 8 Oct 2016 00:01:30 +0000 (17:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Oct 2016 17:04:31 +0000 (10:04 -0700)
commit654311bf6ee0fbf530c088271c2c76d46f31f82d
treea9139ebc933c04178ec29f99143b7a9c624a5ec0tree | snapshot
parent57937f70a09c12ef484c290865dac4066d207c9ccommit | diff
mergetool: honor -O<orderfile>

Teach mergetool to pass "-O<orderfile>" down to `git diff` when
specified on the command-line.

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.