diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-24 14:05:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-24 14:05:26 -0700 |
| commit | cf7864837c12c396ad5927cb6c0bbaa790cda7ad (patch) | |
| tree | 93c489a5a4bfb1fde21851d3b9154990ec528b9a /Documentation | |
| parent | 9c3f19fdfd7b8d7fcbebf05d30a8a41054f89d32 (diff) | |
| parent | 109859e27445a3ad12eb8f8cba43a5aa8f701733 (diff) | |
| download | git-cf7864837c12c396ad5927cb6c0bbaa790cda7ad.tar.gz | |
Merge branch 'jc/mergetool-tool-help'
"git mergetool" did not support --tool-help option to give the list
of supported backends, like "git difftool" does.
* jc/mergetool-tool-help:
mergetool: support --tool-help option like difftool does
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-mergetool.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 2a49de7cfe..d7207bd9b9 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -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 |