Merge branch 'maint'

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 57aa57467537d38f2e3ddcd86f701a0ed74bb42f..a2d55f974525c59f3dd51684531861bf0dc49a23 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -57,7 +57,7 @@ include::diff-options.txt[]
        commits, and doesn't limit diff for those commits.
 
 --follow::
-       Continue listing the history of a file beyond renames.
+       Continue listing the history of a file beyond renames/copies.
 
 --log-size::
        Before the log message print out its size in bytes. Intended