unpack-trees: oneway_merge to update submodules

diff --git a/Documentation/rebase-config.txt b/Documentation/rebase-config.txt
index dba088d7c68f5b730af70e3a8a4eedf0e3bd912e..42e1ba757564e3ccff6da48895a06a65e03fa524 100644 (file)
--- a/Documentation/rebase-config.txt
+++ b/Documentation/rebase-config.txt
@@ -23,10 +23,30 @@ rebase.missingCommitsCheck::
        --edit-todo' can then be used to correct the error. If set to
        "ignore", no checking is done.
        To drop a commit without warning or error, use the `drop`
-       command in the todo-list.
+       command in the todo list.
        Defaults to "ignore".
 
 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
+       todo list during an interactive rebase.  The format will
        automatically have the long commit hash prepended to the format.
+
+rebase.abbreviateCommands::
+       If set to true, `git rebase` will use abbreviated command names in the
+       todo list resulting in something like this:
++
+-------------------------------------------
+       p deadbee The oneline of the commit
+       p fa1afe1 The oneline of the next commit
+       ...
+-------------------------------------------
++
+instead of:
++
+-------------------------------------------
+       pick deadbee The oneline of the commit
+       pick fa1afe1 The oneline of the next commit
+       ...
+-------------------------------------------
++
+Defaults to false.