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

Merge branch 'jc/mergetool-tool-help' into maint

Browse Source 
* jc/mergetool-tool-help:
  mergetool: support --tool-help option like difftool does
This commit is contained in:
Junio C Hamano
2012-08-06 15:30:18 -07:00
parent 0e4c8822e9 109859e274
commit f52a386ef2
3 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-mergetool.txt
View File

@ -27,9 +27,9 @@ OPTIONS
-t <tool>::
--tool=<tool>::
Use the merge resolution program specified by <tool>.
Valid merge tools are:
araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kdiff3,
meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff.
Valid values include emerge, gvimdiff, kdiff3,
meld, vimdiff, and tortoisemerge. Run `git mergetool --tool-help`
for the list of valid <tool> settings.
+
If a merge resolution program is not specified, 'git mergetool'
will use the configuration variable `merge.tool`. If the