Merge branch 'jc/clean-config'

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index b8029463d9e9b356d3b263f50b3eab2012956ee6..5ec547cc0c10fb940b1bd2481940997cd375e830 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -16,7 +16,7 @@ Shows the commit logs.
 
 The command takes options applicable to the gitlink:git-rev-list[1]
 command to control what is shown and how, and options applicable to
-the gitlink:git-diff-tree[1] commands to control how the change
+the gitlink:git-diff-tree[1] commands to control how the changes
 each commit introduces are shown.
 
 This manual page describes only the most frequently used options.
@@ -25,7 +25,7 @@ This manual page describes only the most frequently used options.
 OPTIONS
 -------
 
-include::pretty-formats.txt[]
+include::pretty-options.txt[]
 
 -<n>::
        Limits the number of commits to show.
@@ -38,13 +38,47 @@ 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.
 
+-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.
+
+--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.
 
 
+include::pretty-formats.txt[]
+
+
 Examples
 --------
 git log --no-merges::
@@ -62,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
 ----------
 
@@ -85,4 +125,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 GIT
 ---
 Part of the gitlink:git[7] suite
-