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

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3e37b93ed2ac3edfe478952ef445678ae51a5d47..75c372238dc66b071af103ac56629953a8e85b12 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -769,14 +769,6 @@ am.keepcr::
        by giving '--no-keep-cr' from the command line.
        See linkgit:git-am[1], linkgit:git-mailsplit[1].
 
-am.threeWay::
-       By default, `git am` will fail if the patch does not apply cleanly. When
-       set to true, this setting tells `git am` to fall back on 3-way merge if
-       the patch records the identity of blobs it is supposed to apply to and
-       we have those blobs available locally (equivalent to giving the `--3way`
-       option from the command line). Defaults to `false`.
-       See linkgit:git-am[1].
-
 apply.ignoreWhitespace::
        When set to 'change', tells 'git apply' to ignore changes in
        whitespace, in the same way as the '--ignore-space-change'
@@ -2169,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