summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-15 19:07:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-15 19:07:56 (GMT)
commit90a0f1b44b387877c0bbe427382a2988d906d968 (patch)
tree2fb8f41c534dd4bc108af01a7aa5c29378b7cbf8
parenta7d7853463ae77fc3c8511283f5c896bee673b33 (diff)
parent4ded69169b02f08eb3e097bdf068d3061c049e91 (diff)
downloadgit-90a0f1b44b387877c0bbe427382a2988d906d968.zip
git-90a0f1b44b387877c0bbe427382a2988d906d968.tar.gz
git-90a0f1b44b387877c0bbe427382a2988d906d968.tar.bz2
Merge branch 'eb/doc-log-manpage'
* eb/doc-log-manpage: Reorganize `git-log' man page to clarify common diff options.
-rw-r--r--Documentation/git-log.txt15
1 files changed, 9 insertions, 6 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 8a69647..e970664 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -23,9 +23,6 @@ each commit introduces are shown.
OPTIONS
-------
-:git-log: 1
-include::diff-options.txt[]
-
-<n>::
Limits the number of commits to show.
@@ -36,6 +33,10 @@ include::diff-options.txt[]
For a more complete list of ways to spell <since>
and <until>, see linkgit:gitrevisions[1].
+--follow::
+ Continue listing the history of a file beyond renames
+ (works only for a single file).
+
--no-decorate::
--decorate[=short|full|no]::
Print out the ref names of any commits that are shown. If 'short' is
@@ -55,9 +56,6 @@ include::diff-options.txt[]
the specified paths; this means that "<path>..." limits only
commits, and doesn't limit diff for those commits.
---follow::
- Continue listing the history of a file beyond renames/copies.
-
--log-size::
Before the log message print out its size in bytes. Intended
mainly for porcelain tools consumption. If git is unable to
@@ -71,6 +69,11 @@ include::diff-options.txt[]
to be prefixed with "\-- " to separate them from options or
refnames.
+Common diff options
+~~~~~~~~~~~~~~~~~~~
+
+:git-log: 1
+include::diff-options.txt[]
include::rev-list-options.txt[]