diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-17 15:22:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-17 15:22:57 -0700 |
| commit | c0859f7292882e15477dfc88025e14ce83a625db (patch) | |
| tree | 7ffed07be8918fa7ae147c4a00f1dd23ef64c53e /git-mergetool.txt | |
| parent | 20829a4b8e2b66a8e267b82569d850742ce66a6d (diff) | |
| download | git-htmldocs-c0859f7292882e15477dfc88025e14ce83a625db.tar.gz | |
Autogenerated HTML docs for v2.10.1-502-g65988
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index e846c2ed7..3622d6648 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -79,6 +79,13 @@ 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. +-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 --------------- `git mergetool` creates `*.orig` backup files while resolving merges. |