Documentation/git-submodule: refer to gitmodules(5)

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 5a90f65b5e9d9ce21bcd0c936a01ded5065d5868..5920d1799acd2fe84e302b005695e2c795ecad36 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -27,6 +27,9 @@ OPTIONS
 
 include::pretty-options.txt[]
 
+:git-log: 1
+include::diff-options.txt[]
+
 -<n>::
        Limits the number of commits to show.
 
@@ -43,12 +46,10 @@ include::pretty-options.txt[]
        commit.  This  option gives a better overview of the
        evolution of a particular branch.
 
--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.
+       Cannot be combined with --reverse.
        See also gitlink:git-reflog[1].
 
 --decorate::
@@ -77,6 +78,7 @@ include::pretty-options.txt[]
 
 include::pretty-formats.txt[]
 
+include::diff-generate-patch.txt[]
 
 Examples
 --------
@@ -95,7 +97,7 @@ git log --since="2 weeks ago" \-- gitk::
        The "--" is necessary to avoid confusion with the *branch* named
        'gitk'
 
-git log -r --name-status release..test::
+git log --name-status release..test::
 
        Show the commits that are in the "test" branch but not yet
        in the "release" branch, along with the list of paths