diff options
| author | David Aguilar <davvid@gmail.com> | 2009-01-18 21:27:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-18 22:44:13 -0800 |
| commit | 507cfcbd81196e14053bcd25735aaefabd99395d (patch) | |
| tree | 57849475c3e4de234d5af90c90458b430897dd28 /contrib/difftool/git-difftool | |
| parent | 9003dd40272e556288129272655e654bd33e6fa5 (diff) | |
| download | git-507cfcbd81196e14053bcd25735aaefabd99395d.tar.gz git-507cfcbd81196e14053bcd25735aaefabd99395d.tar.xz | |
difftool: fix documentation problems
This patch makes the difftool docs always refer to the
git-difftool script using the dashed form of the name.
Only command examples use the non-dashed form now.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/difftool/git-difftool')
| -rwxr-xr-x | contrib/difftool/git-difftool | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/difftool/git-difftool b/contrib/difftool/git-difftool index 1fc087c5f..0cda3d2ee 100755 --- a/contrib/difftool/git-difftool +++ b/contrib/difftool/git-difftool @@ -4,7 +4,7 @@ # This is a wrapper around the GIT_EXTERNAL_DIFF-compatible # git-difftool-helper script. This script exports # GIT_EXTERNAL_DIFF and GIT_PAGER for use by git, and -# GIT_NO_PROMPT and GIT_MERGE_TOOL for use by git-difftool-helper. +# GIT_DIFFTOOL_NO_PROMPT and GIT_MERGE_TOOL for use by git-difftool-helper. # Any arguments that are unknown to this script are forwarded to 'git diff'. use strict; @@ -18,8 +18,7 @@ my $DIR = abs_path(dirname($0)); sub usage { print << 'USAGE'; - -usage: git difftool [--no-prompt] [--tool=tool] ["git diff" options] +usage: git difftool [--tool=<tool>] [--no-prompt] ["git diff" options] USAGE exit 1; } |