rebase: make the backend configurable via config setting

[thirdparty/git.git] / Documentation / config / rebase.txt

diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt
index d98e32d812e76f24f6eca49e32af910b1ddd0967..e6ae30c9999b67d8bbadf03566d768b1bf7c7232 100644 (file)
--- a/Documentation/config/rebase.txt
+++ b/Documentation/config/rebase.txt
@@ -5,6 +5,14 @@ rebase.useBuiltin::
        is always used. Setting this will emit a warning, to alert any
        remaining users that setting this now does nothing.
 
+rebase.backend::
+       Default backend to use for rebasing.  Possible choices are
+       'am' or 'merge' (note that the merge backend is sometimes also
+       refered to as the interactive backend or the interactive
+       machinery elsewhere in the docs).  Also, in the future, if the
+       merge backend gains all remaining capabilities of the am
+       backend, this setting may become unused.
+
 rebase.stat::
        Whether to show a diffstat of what changed upstream since the last
        rebase. False by default.