summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJonathon Mah <me@JonathonMah.com>2011-09-16 02:12:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-09-26 16:39:36 (GMT)
commit3e8e691abe4e1cce73a8a2ef413dada0278e7b3b (patch)
tree8835c83dc6dc584482acc6f94063399a07c1e1eb /Documentation
parent2765233c64c35eb43a8b46c377fb8b464469221f (diff)
downloadgit-3e8e691abe4e1cce73a8a2ef413dada0278e7b3b.zip
git-3e8e691abe4e1cce73a8a2ef413dada0278e7b3b.tar.gz
git-3e8e691abe4e1cce73a8a2ef413dada0278e7b3b.tar.bz2
mergetool: Use args as pathspec to unmerged files
Mergetool now treats its path arguments as a pathspec (like other git subcommands), restricting action to the given files and directories. Files matching the pathspec are filtered so mergetool only acts on unmerged paths; previously it would assume each path argument was in an unresolved state, and get confused when it couldn't check out their other stages. Running "git mergetool subdir" will prompt to resolve all conflicted blobs under subdir. Signed-off-by: Jonathon Mah <me@JonathonMah.com> Acked-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 8c79ae8..f1f4e7a 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -16,9 +16,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
-------