Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 7adcdefacfd681729317c59ebacfd4a27db1effd..5ec547cc0c10fb940b1bd2481940997cd375e830 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -49,6 +49,7 @@ include::pretty-options.txt[]
 -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::
@@ -61,6 +62,16 @@ include::pretty-options.txt[]
        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.
 
@@ -85,12 +96,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
 ----------