Merge 1.5.0.7 in

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 361eaec700bf6401f89c7e631f53414a399affe6..030edaf305a620935840b3ffdcc0ca546d4e43da 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -38,6 +38,11 @@ include::pretty-formats.txt[]
        and <until>, see "SPECIFYING REVISIONS" section in
        gitlink:git-rev-parse[1].
 
+--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.
+
 -p::
        Show the change the commit introduces in a patch form.