summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2020-07-29 20:12:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-07-29 20:44:03 (GMT)
commit9a6d515fc38abc36a94228f2b96813e1b07c0059 (patch)
tree65320de5487e270e5c647e985791654fbfad290f /Documentation/diff-options.txt
parent6cea104b2c0266d61fbce7e9ba485dc6d13c0c8f (diff)
downloadgit-9a6d515fc38abc36a94228f2b96813e1b07c0059.zip
git-9a6d515fc38abc36a94228f2b96813e1b07c0059.tar.gz
git-9a6d515fc38abc36a94228f2b96813e1b07c0059.tar.bz2
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>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 7987d72..b7af973 100644
--- 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.