summaryrefslogtreecommitdiffstats
path: root/git-log.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-12-27 03:29:58 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-12-27 03:29:58 +0000
commit554da79be4cae87edd4323dd34fce9958e02b5d3 (patch)
tree3ccad0af64872f6599d9c405b21559abebd49bdc /git-log.txt
parent0ec429328154e4d8268651eca7997f99514ece21 (diff)
downloadgit-htmldocs-554da79be4cae87edd4323dd34fce9958e02b5d3.tar.gz
Autogenerated HTML docs for v1.5.4-rc2
Diffstat (limited to 'git-log.txt')
-rw-r--r--git-log.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/git-log.txt b/git-log.txt
index 5920d1799..d71e51ad4 100644
--- a/git-log.txt
+++ b/git-log.txt
@@ -43,8 +43,12 @@ include::diff-options.txt[]
--first-parent::
Follow only the first parent commit upon seeing a merge
- commit. This option gives a better overview of the
- evolution of a particular branch.
+ 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