Merge branch 'jk/sha1-file-reduce-useless-warnings'

diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt
index 730106c90a18f275523c2c03ac3a16d7347636b0..5e7908e4f705d858dca8483069fd3b89c8f7e31c 100644 (file)
--- a/Documentation/git-reflog.txt
+++ b/Documentation/git-reflog.txt
@@ -88,7 +88,8 @@ Options for `expire`
 
 --updateref::
        Update the reference to the value of the top reflog entry (i.e.
-       <ref>@\{0\}) if the previous top entry was pruned.
+       <ref>@\{0\}) if the previous top entry was pruned.  (This
+       option is ignored for symbolic references.)
 
 --rewrite::
        If a reflog entry's predecessor is pruned, adjust its "old"