diff options
| author | Markus Heidelberg <markus.heidelberg@web.de> | 2009-01-16 22:42:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-17 18:17:29 -0800 |
| commit | 6b89d068bd78b978743e96de7827d8a2a4d9f200 (patch) | |
| tree | d6a80f31bd4890a3ffb97771f80a94d7d7ebafd0 /Documentation/git-mergetool.txt | |
| parent | 7bbd8d6c139f163ee26b8416cd227408888f31c3 (diff) | |
| download | git-6b89d068bd78b978743e96de7827d8a2a4d9f200.tar.gz | |
Documentation: let asciidoc align related options
Fixes the description of the -t option in git-mergetool, which
failed to hint that it takes an argument.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 4c0ffec507..5d3c632872 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/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. |