Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: let asciidoc align related options
author
Markus Heidelberg
<markus.heidelberg@web.de>
Fri, 16 Jan 2009 21:42:33 +0000
(22:42 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 18 Jan 2009 02:17:29 +0000
(18:17 -0800)
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>
Documentation/git-mergetool.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
7bbd8d6
)
diff --git
a/Documentation/git-mergetool.txt
b/Documentation/git-mergetool.txt
index 4c0ffec507185dfe1e88683e1a23066089571d2c..5d3c6328726ba1af829026dd97840fc43335cfe0 100644
(file)
--- 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.