mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jm/mergetool-pathspec'

Browse Source 
* jm/mergetool-pathspec:
  mergetool: no longer need to save standard input
  mergetool: Use args as pathspec to unmerged files
This commit is contained in:
Junio C Hamano
2011-10-10 15:56:18 -07:00
parent 7ddd582402 6d9990a959
commit 5fbdb9c2e8
3 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-mergetool.txt
View File

@ -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
-------