diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-01-18 18:26:37 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-01-18 18:26:37 +0000 |
| commit | bd53dbff51079dc26ea27b00d94b28a5229c0fec (patch) | |
| tree | ed0a78743f67e293b2302e91fefa24e6e579c428 /git-mergetool.txt | |
| parent | 4efe0e79bcead21602c1f6669f07d4739358ca1a (diff) | |
| download | git-htmldocs-bd53dbff51079dc26ea27b00d94b28a5229c0fec.tar.gz | |
Autogenerated HTML docs for v1.6.1-203-ga83c8
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 4c0ffec50..5d3c63287 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -22,7 +22,8 @@ with merge conflicts. OPTIONS ------- --t or --tool=<tool>:: +-t <tool>:: +--tool=<tool>:: Use the merge resolution program specified by <tool>. Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff @@ -60,7 +61,8 @@ variable `mergetool.<tool>.trustExitCode` can be set to `true`. Otherwise, 'git-mergetool' will prompt the user to indicate the success of the resolution after the custom tool has exited. --y or --no-prompt:: +-y:: +--no-prompt:: Don't prompt before each invocation of the merge resolution program. |