GIT 1.5.4-rc2

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 5ec547cc0c10fb940b1bd2481940997cd375e830..d71e51ad46f665a594414aea7e107b4977783e46 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -27,6 +27,9 @@ OPTIONS
 
 include::pretty-options.txt[]
 
+:git-log: 1
+include::diff-options.txt[]
+
 -<n>::
        Limits the number of commits to show.
 
@@ -40,11 +43,12 @@ include::pretty-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.
-
--p::
-       Show the change the commit introduces in a patch form.
+       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
@@ -78,6 +82,7 @@ include::pretty-options.txt[]
 
 include::pretty-formats.txt[]
 
+include::diff-generate-patch.txt[]
 
 Examples
 --------