diff options
| author | David Aguilar <davvid@gmail.com> | 2012-08-10 00:39:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-10 08:07:41 -0700 |
| commit | 7a30747fbacd9a2059e861cba80ebd67685ffe80 (patch) | |
| tree | 85648c18332a66ea72ff52f9b41744688d7247eb /Documentation/git-difftool.txt | |
| parent | 190f5475f2a7edb777b65367d8796177aa13c830 (diff) | |
| download | git-7a30747fbacd9a2059e861cba80ebd67685ffe80.tar.gz | |
mergetool,difftool: Document --tool-help consistently
Add an entry for --tool-help to the mergetool documentation.
Move --tool-help in the difftool documentation so that it is
listed immediately after --tool so that it is easier to find.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-difftool.txt')
| -rw-r--r-- | Documentation/git-difftool.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 313d54e18d..73ca7025a3 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -66,6 +66,9 @@ of the diff post-image. `$MERGED` is the name of the file which is being compared. `$BASE` is provided for compatibility with custom merge tool commands and has the same value as `$MERGED`. +--tool-help:: + Print a list of diff tools that may be used with `--tool`. + --symlinks:: --no-symlinks:: 'git difftool''s default behavior is create symlinks to the @@ -74,9 +77,6 @@ with custom merge tool commands and has the same value as `$MERGED`. Specifying `--no-symlinks` instructs 'git difftool' to create copies instead. `--no-symlinks` is the default on Windows. ---tool-help:: - Print a list of diff tools that may be used with `--tool`. - -x <command>:: --extcmd=<command>:: Specify a custom command for viewing diffs. |