summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-26 23:13:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-26 23:13:27 (GMT)
commitf0911b996cac9b89b9175676f74bbcb5a9a9e34f (patch)
tree03bd073f1cc63a3b68f9a8a14babf44a09a3a2a6 /Documentation
parent411e6cf1971936ba31ffa142a6d5dc5c06dc8f7a (diff)
parent8280baf565e1c72adaa6d2dfef70d18837126898 (diff)
downloadgit-f0911b996cac9b89b9175676f74bbcb5a9a9e34f.zip
git-f0911b996cac9b89b9175676f74bbcb5a9a9e34f.tar.gz
git-f0911b996cac9b89b9175676f74bbcb5a9a9e34f.tar.bz2
Merge branch 'maint-1.7.6' into maint
* maint-1.7.6: notes_merge_commit(): do not pass temporary buffer to other function gitweb: Fix links to lines in blobs when javascript-actions are enabled mergetool: no longer need to save standard input mergetool: Use args as pathspec to unmerged files t9159-*.sh: skip for mergeinfo test for svn <= 1.4 date.c: Support iso8601 timezone formats remote: only update remote-tracking branch if updating refspec remote rename: warn when refspec was not updated remote: "rename o foo" should not rename ref "origin/bar" remote: write correct fetch spec when renaming remote 'remote'
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
-------