diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-10 15:56:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-10 15:56:18 -0700 |
| commit | 5fbdb9c2e8cc7226d9a9e7de5ad09ac5f0a0b906 (patch) | |
| tree | 76972a1c5eebdc2ade46704ac95b04c712e5321b /Documentation/git-mergetool.txt | |
| parent | 7ddd582402aa926d5ec33d914ccc8bfaf1b15c06 (diff) | |
| parent | 6d9990a959c0168ab6dfe75236980f95ac512ce5 (diff) | |
| download | git-5fbdb9c2e8cc7226d9a9e7de5ad09ac5f0a0b906.tar.gz | |
Merge branch 'jm/mergetool-pathspec'
* jm/mergetool-pathspec:
mergetool: no longer need to save standard input
mergetool: Use args as pathspec to unmerged files
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 3470910109..2a49de7cfe 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -17,9 +17,10 @@ Use `git mergetool` to run one of several merge utilities to resolve merge conflicts. It is typically run after 'git merge'. If one or more <file> parameters are given, the merge tool program will -be run to resolve differences on each file. If no <file> names are -specified, 'git mergetool' will run the merge tool program on every file -with merge conflicts. +be run to resolve differences on each file (skipping those without +conflicts). Specifying a directory will include all unresolved files in +that path. If no <file> names are specified, 'git mergetool' will run +the merge tool program on every file with merge conflicts. OPTIONS ------- |