diff options
| author | David Aguilar <davvid@gmail.com> | 2016-10-07 16:58:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-11 10:04:27 -0700 |
| commit | 57937f70a09c12ef484c290865dac4066d207c9c (patch) | |
| tree | d44cb9e278c3e42c2f0fa3b446ff021e8512f722 /Documentation | |
| parent | 08221e3fa27396aca30cb539f006f78636782951 (diff) | |
| download | git-57937f70a09c12ef484c290865dac4066d207c9c.tar.gz git-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')
| -rw-r--r-- | Documentation/git-mergetool.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index e846c2ed7..c4c1a9bde 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -79,6 +79,11 @@ success of the resolution after the custom tool has exited. Prompt before each invocation of the merge resolution program to give the user a chance to skip the path. +DIFF ORDER FILES +---------------- +`git mergetool` honors the `diff.orderFile` configuration variable +used by `git diff`. See linkgit:git-config[1] for more details. + TEMPORARY FILES --------------- `git mergetool` creates `*.orig` backup files while resolving merges. |