Fix documentation of --first-parent in git-log and copy it to git-rev-list
Credit goes to Avi Kivity for noticing the lack of description in rev-list manual page. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 26, 2007 at 16:04 UTC
25db465a34ab6fe840011e5d746701186e9e9884
2 files changed
+16
-2
Documentation/git-log.txt
+6
-2
@@ -43,8 +43,12 @@ include::diff-options.txt[]
43
44
--first-parent::
45
Follow only the first parent commit upon seeing a merge
46
- commit. This option gives a better overview of the
47
- evolution of a particular branch.
46
+ commit. This option can give a better overview when
47
+ viewing the evolution of a particular topic branch,
48
+ because merges into a topic branch tend to be only about
49
+ adjusting to updated upstream from time to time, and
50
+ this option allows you to ignore the individual commits
51
+ brought in to your history by such a merge.
52
53
-g, \--walk-reflogs::
54
Show commits as they were recorded in the reflog. The log contains
Documentation/git-rev-list.txt
+10
@@ -15,6 +15,7 @@ SYNOPSIS
15
[ \--min-age=timestamp ]
16
[ \--sparse ]
17
[ \--no-merges ]
18
+ [ \--first-parent ]
19
[ \--remove-empty ]
20
[ \--full-history ]
21
[ \--not ]
@@ -256,6 +257,15 @@ limiting may be applied.
257
258
Do not print commits with more than one parent.
259
260
+--first-parent::
261
+ Follow only the first parent commit upon seeing a merge
262
+ commit. This option can give a better overview when
263
+ viewing the evolution of a particular topic branch,
264
+ because merges into a topic branch tend to be only about
265
+ adjusting to updated upstream from time to time, and
266
+ this option allows you to ignore the individual commits
267
+ brought in to your history by such a merge.
268
+
269
--not::
270
271
Reverses the meaning of the '{caret}' prefix (or lack thereof)