From 9a6d515fc38abc36a94228f2b96813e1b07c0059 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 29 Jul 2020 16:12:10 -0400 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- Documentation/diff-options.txt | 5 +++++ Documentation/git-log.txt | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 7987d72b02..b7af973d9c 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. diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 2cbe636b2b..0a4c99e5f8 100644 --- 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[] -- 2.47.3