summaryrefslogtreecommitdiff
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r--Documentation/git-log.txt19
1 files changed, 6 insertions, 13 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index ff41784..2c84028 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -25,6 +25,7 @@ OPTIONS
-<n>::
Limits the number of commits to show.
+ Note that this is a commit limiting option, see below.
<since>..<until>::
Show only commits between the named two commits. When
@@ -72,16 +73,16 @@ produced by --stat etc.
to be prefixed with "\-- " to separate them from options or
refnames.
+include::rev-list-options.txt[]
+
+include::pretty-formats.txt[]
+
Common diff options
-~~~~~~~~~~~~~~~~~~~
+-------------------
:git-log: 1
include::diff-options.txt[]
-include::rev-list-options.txt[]
-
-include::pretty-formats.txt[]
-
include::diff-generate-patch.txt[]
Examples
@@ -181,14 +182,6 @@ This setting can be disabled by the `--no-standard-notes` option,
overridden by the 'GIT_NOTES_DISPLAY_REF' environment variable,
and supplemented by the `--show-notes` option.
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
GIT
---
Part of the linkgit:git[1] suite