[PATCH] difftool: add a -y shortcut for --no-prompt
- From
David Aguilar <davvid@gmail.com>
- Date
- Mar 25, 2009, 06:29 UTC
- Message-ID
- <1237962599-29625-1-git-send-email-davvid@gmail.com>
This is another consistency cleanup to make git-difftool's options match git-mergetool.
Signed-off-by: David Aguilar <davvid@gmail.com> ---
This also fixes the style used for the -h option which I should have caught in my previous patch. Doh!
Documentation/git-difftool.txt | 3 ++- git-difftool.perl | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 23070c1..be1020d 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -7,7 +7,7 @@ git-difftool - Show changes using common diff tools SYNOPSIS -------- -'git difftool' [--tool=<tool>] [--no-prompt] [<'git diff' options>] +'git difftool' [--tool=<tool>] [-y|--no-prompt] [<'git diff' options>] DESCRIPTION ----------- @@ -17,6 +17,7 @@ to 'git-diff' and accepts the same options and arguments. OPTIONS ------- +-y:: --no-prompt:: Do not prompt before launching a diff tool. diff --git a/git-difftool.perl b/git-difftool.perl index 207dd50..5bc64d5 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -18,7 +18,7 @@ my $DIR = abs_path(dirname($0)); sub usage { print << 'USAGE'; -usage: git difftool [--tool=<tool>] [--no-prompt] ["git diff" options] +usage: git difftool [--tool=<tool>] [-y|--no-prompt] ["git diff" options] USAGE exit 1; } @@ -60,11 +60,11 @@ sub generate_command $ENV{GIT_DIFF_TOOL} = substr($arg, 7); next; } - if ($arg eq '--no-prompt') { + if ($arg eq '-y' || '--no-prompt') { $ENV{GIT_DIFFTOOL_NO_PROMPT} = 'true'; next; } - if ($arg eq '-h' or $arg eq '--help') { + if ($arg eq '-h' || $arg eq '--help') { usage(); } push @command, $arg;
-- 1.6.2.1.303.g63699