diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-11-02 11:04:56 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 11:04:56 +0900 |
commit | ee5e90434e2c3b221b11672eb09044a91d75a524 (patch) | |
tree | 05cffb820a8574ba1316ebde0c929631d32aad52 /builtin/rebase.c | |
parent | Merge branch 'js/rebase-in-c-5.5-work-with-rebase-i-in-c' (diff) | |
parent | rebase: default to using the builtin rebase (diff) | |
download | tgif-ee5e90434e2c3b221b11672eb09044a91d75a524.tar.xz |
Merge branch 'pk/rebase-in-c-6-final'
The final step of rewriting "rebase -i" in C.
* pk/rebase-in-c-6-final:
rebase: default to using the builtin rebase
Diffstat (limited to 'builtin/rebase.c')
-rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 789d869842..f1355efee7 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -55,7 +55,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); |