Merge branch 'mr/rebase-i-customize-insn-sheet'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 43bb53c0477276d81af484cdb64855698b6a635b..75c372238dc66b071af103ac56629953a8e85b12 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2161,6 +2161,11 @@ rebase.autoStash::
        successful rebase might result in non-trivial conflicts.
        Defaults to false.
 
+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.
+
 receive.advertiseAtomic::
        By default, git-receive-pack will advertise the atomic push
        capability to its clients. If you don't want to this capability