GIT 1.5.4-rc2

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 6157edb404db3ff0db0bb21e826e140037acb6af..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,19 +43,38 @@ 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
        a record about how the tip of a reference was changed.
+       Cannot be combined with --reverse.
        See also gitlink:git-reflog[1].
 
 --decorate::
-    Print out the ref names of any commits that are shown.
+       Print out the ref names of any commits that are shown.
+
+--full-diff::
+       Without this flag, "git log -p <paths>..." shows commits that
+       touch the specified paths, and diffs about the same specified
+       paths.  With this, the full diff is shown for commits that touch
+       the specified paths; this means that "<paths>..." limits only
+       commits, and doesn't limit diff for those commits.
+
+--follow::
+       Continue listing the history of a file beyond renames.
+
+--log-size::
+       Before the log message print out its size in bytes. Intended
+       mainly for porcelain tools consumption. If git is unable to
+       produce a valid value size is set to zero.
+       Note that only message is considered, if also a diff is shown
+       its size is not included.
 
 <paths>...::
        Show only commits that affect the specified paths.
@@ -60,6 +82,7 @@ include::pretty-options.txt[]
 
 include::pretty-formats.txt[]
 
+include::diff-generate-patch.txt[]
 
 Examples
 --------
@@ -78,12 +101,18 @@ git log --since="2 weeks ago" \-- gitk::
        The "--" is necessary to avoid confusion with the *branch* named
        'gitk'
 
-git log -r --name-status release..test::
+git log --name-status release..test::
 
        Show the commits that are in the "test" branch but not yet
        in the "release" branch, along with the list of paths
        each commit modifies.
 
+git log --follow builtin-rev-list.c::
+
+       Shows the commits that changed builtin-rev-list.c, including
+       those commits that occurred before the file was given its
+       present name.
+
 Discussion
 ----------