difftool: add a -y shortcut for --no-prompt

This is another consistency cleanup to make git-difftool's options
match git-mergetool.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/difftool/git-difftool b/contrib/difftool/git-difftool
index 207dd50f2ca4ca328b7233f80b7c350277bc547b..8c160e5bb4a01319eb1257141813c03b54a3e758 100755 (executable)
--- a/contrib/difftool/git-difftool
+++ b/contrib/difftool/git-difftool
@@ -18,7 +18,7 @@ my $DIR = abs_path(dirname($0));
 sub usage
 {
        print << 'USAGE';
 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;
 }
 USAGE
        exit 1;
 }


@@ -60,11 +60,11 @@ sub generate_command
                        $ENV{GIT_DIFF_TOOL} = substr($arg, 7);
                        next;
                }
                        $ENV{GIT_DIFF_TOOL} = substr($arg, 7);
                        next;
                }

-               if ($arg eq '--no-prompt') {
+               if ($arg eq '-y' || $arg eq '--no-prompt') {

                        $ENV{GIT_DIFFTOOL_NO_PROMPT} = 'true';
                        next;
                }
                        $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;
                        usage();
                }
                push @command, $arg;

diff --git a/contrib/difftool/git-difftool.txt b/contrib/difftool/git-difftool.txt
index 2b7bc03ec3f63ce8bfe4ba8c00af9ab807e6cedf..a00e9431c596431bc61600db3775a36b5ff7d521 100644 (file)
--- a/contrib/difftool/git-difftool.txt
+++ b/contrib/difftool/git-difftool.txt
@@ -3,35 +3,32 @@ git-difftool(1)
 
 NAME
 ----
 
 NAME
 ----

-git-difftool - compare changes using common merge tools
+git-difftool - Show changes using common diff tools

 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git difftool' [--tool=<tool>] [--no-prompt] ['git diff' options]
+'git difftool' [--tool=<tool>] [-y|--no-prompt] [<'git diff' options>]

 
 DESCRIPTION
 -----------
 'git-difftool' is a git command that allows you to compare and edit files
 
 DESCRIPTION
 -----------
 'git-difftool' is a git command that allows you to compare and edit files

-between revisions using common merge tools.  At its most basic level,
-'git-difftool' does what 'git-mergetool' does but its use is for non-merge
-situations such as when preparing commits or comparing changes against
-the index.
-
-'git difftool' is a frontend to 'git diff' and accepts the same
-arguments and options.
-
-See linkgit:git-diff[1] for the full list of supported options.
+between revisions using common diff tools.  'git difftool' is a frontend
+to 'git-diff' and accepts the same options and arguments.

 
 OPTIONS
 -------
 
 OPTIONS
 -------

+-y::
+--no-prompt::
+       Do not prompt before launching a diff tool.
+

 -t <tool>::
 --tool=<tool>::
 -t <tool>::
 --tool=<tool>::

-       Use the merge resolution program specified by <tool>.
+       Use the diff tool specified by <tool>.

        Valid merge tools are:
        kdiff3, kompare, tkdiff, meld, xxdiff, emerge,
        vimdiff, gvimdiff, ecmerge, and opendiff
 +
        Valid merge tools are:
        kdiff3, kompare, tkdiff, meld, xxdiff, emerge,
        vimdiff, gvimdiff, ecmerge, and opendiff
 +

-If a merge resolution program is not specified, 'git-difftool'
+If a diff tool is not specified, 'git-difftool'

 will use the configuration variable `diff.tool`.  If the
 configuration variable `diff.tool` is not set, 'git-difftool'
 will pick a suitable default.
 will use the configuration variable `diff.tool`.  If the
 configuration variable `diff.tool` is not set, 'git-difftool'
 will pick a suitable default.


@@ -42,7 +39,7 @@ can configure the absolute path to kdiff3 by setting
 `difftool.kdiff3.path`. Otherwise, 'git-difftool' assumes the
 tool is available in PATH.
 +
 `difftool.kdiff3.path`. Otherwise, 'git-difftool' assumes the
 tool is available in PATH.
 +

-Instead of running one of the known merge tool programs,
+Instead of running one of the known diff tools,

 'git-difftool' can be customized to run an alternative program
 by specifying the command line to invoke in a configuration
 variable `difftool.<tool>.cmd`.
 'git-difftool' can be customized to run an alternative program
 by specifying the command line to invoke in a configuration
 variable `difftool.<tool>.cmd`.


@@ -56,8 +53,7 @@ is set to the name of the temporary file containing the contents
 of the diff post-image.  `$BASE` is provided for compatibility
 with custom merge tool commands and has the same value as `$LOCAL`.
 
 of the diff post-image.  `$BASE` is provided for compatibility
 with custom merge tool commands and has the same value as `$LOCAL`.
 

---no-prompt::
-       Do not prompt before launching a diff tool.
+See linkgit:git-diff[1] for the full list of supported options.

 
 CONFIG VARIABLES
 ----------------
 
 CONFIG VARIABLES
 ----------------


@@ -65,21 +61,17 @@ CONFIG VARIABLES
 difftool equivalents have not been defined.
 
 diff.tool::
 difftool equivalents have not been defined.
 
 diff.tool::

-       The default merge tool to use.
+       The default diff tool to use.

 
 difftool.<tool>.path::
        Override the path for the given tool.  This is useful in case
        your tool is not in the PATH.
 
 difftool.<tool>.cmd::
 
 difftool.<tool>.path::
        Override the path for the given tool.  This is useful in case
        your tool is not in the PATH.
 
 difftool.<tool>.cmd::

-       Specify the command to invoke the specified merge tool.
+       Specify the command to invoke the specified diff tool.

 +
 See the `--tool=<tool>` option above for more details.
 
 +
 See the `--tool=<tool>` option above for more details.
 

-merge.keepBackup::
-       The original, unedited file content can be saved to a file with
-       a `.orig` extension.  Defaults to `true` (i.e. keep the backup files).
-

 SEE ALSO
 --------
 linkgit:git-diff[1]::
 SEE ALSO
 --------
 linkgit:git-diff[1]::