summaryrefslogtreecommitdiff
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2020-07-29 20:11:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-07-29 20:44:03 (GMT)
commit6cea104b2c0266d61fbce7e9ba485dc6d13c0c8f (patch)
tree45f6365606ccd2be0beaab150ab4698e67fffcbe /Documentation/git-log.txt
parent6f2e02aeb004a2ecd6aec1732f4abeaf88fba4b9 (diff)
downloadgit-6cea104b2c0266d61fbce7e9ba485dc6d13c0c8f.zip
git-6cea104b2c0266d61fbce7e9ba485dc6d13c0c8f.tar.gz
git-6cea104b2c0266d61fbce7e9ba485dc6d13c0c8f.tar.bz2
doc/git-log: drop "-r" diff option
This has been the default since 170c04383b (Porcelain level "log" family should recurse when diffing., 2007-08-27). There's not even a way to turn it off, so you'd never even want "-r" to override that. It's not the default for plumbing like diff-tree, of course, but the option is documented separately there. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r--Documentation/git-log.txt5
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index fb3998d..2cbe636 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -146,11 +146,8 @@ 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.
--r::
- Show recursive diffs.
-
-t::
- Show the tree objects in the diff output. This implies `-r`.
+ Show the tree objects in the diff output.
:git-log: 1
include::diff-options.txt[]