summaryrefslogtreecommitdiff
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-01-18 22:58:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-18 23:09:08 (GMT)
commitfdcf39e59b98536d2d65b26a59925dc1dea421d4 (patch)
tree4ebc125fd70a9d7f31304a8d6ed1e7893f726636 /Documentation/git-log.txt
parentf854824bc50c3a05d7773dce81052f9eb8670d5f (diff)
downloadgit-fdcf39e59b98536d2d65b26a59925dc1dea421d4.zip
git-fdcf39e59b98536d2d65b26a59925dc1dea421d4.tar.gz
git-fdcf39e59b98536d2d65b26a59925dc1dea421d4.tar.bz2
Include rev-list options in git-log manpage.
Replace the "This manual page describes only the most frequently used options." text with the list of rev-list options in git-log manpage. (The git-diff-tree options are already included.) Move these options to a separate file and include it from both git-rev-list.txt and git-log.txt. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r--Documentation/git-log.txt21
1 files changed, 2 insertions, 19 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 5985f47..ebaee4b 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -19,14 +19,10 @@ command to control what is shown and how, and options applicable to
the linkgit:git-diff-tree[1] commands to control how the changes
each commit introduces are shown.
-This manual page describes only the most frequently used options.
-
OPTIONS
-------
-include::pretty-options.txt[]
-
:git-log: 1
include::diff-options.txt[]
@@ -41,21 +37,6 @@ include::diff-options.txt[]
and <until>, see "SPECIFYING REVISIONS" section in
linkgit:git-rev-parse[1].
---first-parent::
- Follow only the first parent commit upon seeing a merge
- commit. This option can give a better overview when
- viewing the evolution of a particular topic branch,
- because merges into a topic branch tend to be only about
- adjusting to updated upstream from time to time, and
- this option allows you to ignore the individual commits
- brought in to your history by such a merge.
-
--g, \--walk-reflogs::
- Show commits as they were recorded in the reflog. The log contains
- a record about how the tip of a reference was changed.
- Cannot be combined with --reverse.
- See also linkgit:git-reflog[1].
-
--decorate::
Print out the ref names of any commits that are shown.
@@ -80,6 +61,8 @@ include::diff-options.txt[]
Show only commits that affect the specified paths.
+include::rev-list-options.txt[]
+
include::pretty-formats.txt[]
include::diff-generate-patch.txt[]