make the name of the library directory a config option

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 49bb539dea6ad86fa8844cf6bbe27a74af41b4e4..63c1dbe812e6078870569c0b8d03ff021e4b56a3 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -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.
@@ -51,10 +51,26 @@ include::pretty-formats.txt[]
        a record about how the tip of a reference was changed.
        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.
+
 <paths>...::
        Show only commits that affect the specified paths.
 
 
+include::pretty-formats.txt[]
+
+
 Examples
 --------
 git log --no-merges::
@@ -78,6 +94,12 @@ git log -r --name-status release..test::
        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
 ----------
 
@@ -95,4 +117,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 GIT
 ---
 Part of the gitlink:git[7] suite
-