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>
This commit is contained in:
Jeff King 2020-07-29 16:12:10 -04:00 committed by Junio C Hamano
parent 6cea104b2c
commit 9a6d515fc3
2 changed files with 5 additions and 3 deletions

View File

@ -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.

View File

@ -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[]