From 6b89d068bd78b978743e96de7827d8a2a4d9f200 Mon Sep 17 00:00:00 2001 From: Markus Heidelberg Date: Fri, 16 Jan 2009 22:42:33 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- Documentation/git-mergetool.txt | 6 ++++-- 1 file 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=:: +-t :: +--tool=:: Use the merge resolution program specified by . Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff @@ -60,7 +61,8 @@ variable `mergetool..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. -- 2.11.4.GIT