about summary refs log tree commit diff
path: root/third_party/git/Documentation/config/rebase.txt
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/Documentation/config/rebase.txt
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/Documentation/config/rebase.txt')
-rw-r--r--third_party/git/Documentation/config/rebase.txt6
1 files changed, 0 insertions, 6 deletions
diff --git a/third_party/git/Documentation/config/rebase.txt b/third_party/git/Documentation/config/rebase.txt
index 7f7a07d22f86..d98e32d812e7 100644
--- a/third_party/git/Documentation/config/rebase.txt
+++ b/third_party/git/Documentation/config/rebase.txt
@@ -5,12 +5,6 @@ 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.