summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-26 23:12:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-26 23:12:25 (GMT)
commit87d99c64dfa8880592104245896557aa530d4fd9 (patch)
treebaf019f2b0272eb4a6033d9f1c78f0f80be9d665 /Documentation
parent716b64a73e65d7494dfb37631292fcbe8cb34cc0 (diff)
parent6d9990a959c0168ab6dfe75236980f95ac512ce5 (diff)
downloadgit-87d99c64dfa8880592104245896557aa530d4fd9.zip
git-87d99c64dfa8880592104245896557aa530d4fd9.tar.gz
git-87d99c64dfa8880592104245896557aa530d4fd9.tar.bz2
Merge branch 'jm/mergetool-pathspec' into maint-1.7.6
* jm/mergetool-pathspec: mergetool: no longer need to save standard input mergetool: Use args as pathspec to unmerged files
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-mergetool.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 3470910..2a49de7 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
-------