Merge branch 'maint'

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 030edaf305a620935840b3ffdcc0ca546d4e43da..49bb539dea6ad86fa8844cf6bbe27a74af41b4e4 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -46,6 +46,11 @@ include::pretty-formats.txt[]
 -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.
+       See also gitlink:git-reflog[1].
+
 <paths>...::
        Show only commits that affect the specified paths.