Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1

diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 313d54e18de09cffde502148871210ed7501df4e..73ca7025a39630907e3a019dfed14542f4ac7538 100644 (file)
--- 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.