about summary refs log tree commit diff
path: root/third_party/git/Documentation/config/rebase.txt
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/Documentation/config/rebase.txt')
-rw-r--r--third_party/git/Documentation/config/rebase.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/third_party/git/Documentation/config/rebase.txt b/third_party/git/Documentation/config/rebase.txt
index d98e32d812e7..7f7a07d22f86 100644
--- a/third_party/git/Documentation/config/rebase.txt
+++ b/third_party/git/Documentation/config/rebase.txt
@@ -5,6 +5,12 @@ 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
+	'apply' or 'merge'.  In the future, if the merge backend gains
+	all remaining capabilities of the apply backend, this setting
+	may become unused.
+
 rebase.stat::
 	Whether to show a diffstat of what changed upstream since the last
 	rebase. False by default.