Merge branch 'jk/rebase-config-insn-fmt-docfix' into maint

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 21fdddf24001c020061ed33c759b2eacde8d7c30..cbae7a65b60dd027479addbc912b883bc9c5fdd7 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2436,7 +2436,7 @@ rebase.missingCommitsCheck::
        command in the todo-list.
        Defaults to "ignore".
 
-rebase.instructionFormat
+rebase.instructionFormat::
        A format string, as specified in linkgit:git-log[1], to be used for
        the instruction list during an interactive rebase.  The format will automatically
        have the long commit hash prepended to the format.