summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Pratik Karki <predatoramigo@gmail.com>2018-08-08 21:38:02 +0545
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-11 14:19:42 +0900
commit5541bd5b8f799ab2ae3901e38704d056b455d6ad (patch)
tree23e29628bf70e29254dc84db1758e122d9374963
parentbuiltin rebase: prepare for builtin rebase -i (diff)
downloadtgif-5541bd5b8f799ab2ae3901e38704d056b455d6ad.tar.xz
rebase: default to using the builtin rebase
Now that the builtin rebase is feature-complete, we should use it by default. Let's keep the legacy scripted version around for the time being; Once the builtin rebase is well-tested enough, we can remove `git-legacy-rebase.sh`. Signed-off-by: Pratik Karki <predatoramigo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/rebase.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 60e357c735..9dc8475cd3 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -54,7 +54,7 @@ static int use_builtin_rebase(void)
cp.git_cmd = 1;
if (capture_command(&cp, &out, 6)) {
strbuf_release(&out);
- return 0;
+ return 1;
}
strbuf_trim(&out);