mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
7bbd8d6c13
commit
6b89d068bd
|
@ -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.
|
||||
|
||||
|
|
Loading…
Reference in a new issue