Merge branch 'mm/keyid-docs'

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 5692945a0b38c0b9e8e79e73a9a755c292224c98..97b9993ee8c2aeef504e96a041424e1d396a75d8 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -184,6 +184,12 @@ log.date::
        `--date` option.)  Defaults to "default", which means to write
        dates like `Sat May 8 19:35:34 2010 -0500`.
 
+log.follow::
+       If a single <path> is given to git log, it will act as
+       if the `--follow` option was also used.  This has the same
+       limitations as `--follow`, i.e. it cannot be used to follow
+       multiple files and does not work well on non-linear history.
+
 log.showRoot::
        If `false`, `git log` and related commands will not treat the
        initial commit as a big creation event.  Any root commits in