diff options
| author | David Aguilar <davvid@gmail.com> | 2016-10-07 17:01:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-11 10:04:31 -0700 |
| commit | 654311bf6ee0fbf530c088271c2c76d46f31f82d (patch) | |
| tree | a9139ebc933c04178ec29f99143b7a9c624a5ec0 /Documentation/git-mergetool.txt | |
| parent | 57937f70a09c12ef484c290865dac4066d207c9c (diff) | |
| download | git-654311bf6ee0fbf530c088271c2c76d46f31f82d.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index c4c1a9bde4..3622d66488 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -79,10 +79,12 @@ 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. +-O<orderfile>:: + Process files in the order specified in the + <orderfile>, which has one shell glob pattern per line. + This overrides the `diff.orderFile` configuration variable + (see linkgit:git-config[1]). To cancel `diff.orderFile`, + use `-O/dev/null`. TEMPORARY FILES --------------- |