doc/git-log: move "-t" into diff-options list

The "-t" option is infrequently used; it doesn't deserve a spot near the
top of the options list. Let's push it down into the diff-options
include, near the definition of --raw.

We'll protect it with a git-log ifdef, since it doesn't make any sense
for non-tree diff commands. Note that this means it also shows up in
git-show, but that's a good thing; it applies equally well there.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 7987d72b0212e1247ff5ea14b553d4a322c1f5f5..b7af973d9c9d119f43fb19f7f787c4f9317f192c 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -73,6 +73,11 @@ ifndef::git-format-patch[]
        Synonym for `-p --raw`.
 endif::git-format-patch[]
 
+ifdef::git-log[]
+-t::
+       Show the tree objects in the diff output.
+endif::git-log[]
+
 --indent-heuristic::
        Enable the heuristic that shifts diff hunk boundaries to make patches
        easier to read. This is the default.

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 2cbe636b2b29d0db7177d595f13edc698830336a..0a4c99e5f83b2f9a26b294b27db85bd7cf577166 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -146,9 +146,6 @@ below can be used to show the changes made by each commit.
        in that case, the output represents the changes the merge
        brought _into_ the then-current branch.
 
--t::
-       Show the tree objects in the diff output.
-
 :git-log: 1
 include::diff-options.txt[]