GIT 1.5.5.4

[git.git] / Documentation / git-log.txt

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 5985f4739407f79fb4b5d564fba35735b653f7b0..ebaee4b3348ce9f7a4fcac6d9726a0251c51df72 100644 (file)
--- 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[]