summaryrefslogtreecommitdiffstats
path: root/git-log.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-01-19 08:02:00 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-01-19 08:02:00 +0000
commitb0e0295abe39b01a1203514fe8b9167705bb7e5b (patch)
treecafea2b3b2b744b7f816aaee0bed824db3811185 /git-log.txt
parentbe62189fe29cca6073b9f211d390a77ea46ae2d7 (diff)
downloadgit-htmldocs-b0e0295abe39b01a1203514fe8b9167705bb7e5b.tar.gz
Autogenerated HTML docs for v1.5.4-rc3-37-gfdcf3
Diffstat (limited to 'git-log.txt')
-rw-r--r--git-log.txt21
1 files changed, 2 insertions, 19 deletions
diff --git a/git-log.txt b/git-log.txt
index 5985f4739..ebaee4b33 100644
--- a/git-log.txt
+++ b/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[]