summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2016-10-07 16:58:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-11 10:04:27 -0700
commit57937f70a09c12ef484c290865dac4066d207c9c (patch)
treed44cb9e278c3e42c2f0fa3b446ff021e8512f722 /Documentation/gitattributes.txt
parentmergetool: move main program flow into a main() function (diff)
downloadtgif-57937f70a09c12ef484c290865dac4066d207c9c.tar.xz
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>
Diffstat (limited to 'Documentation/gitattributes.txt')
0 files changed, 0 insertions, 0 deletions