From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Nov 2018 02:04:56 +0000 (+0900)
Subject: Merge branch 'pk/rebase-in-c-6-final'
X-Git-Tag: v2.20.0-rc0~88
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ee5e90434e2c3b221b11672eb09044a91d75a524?ds=inline;hp=-c

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
---

ee5e90434e2c3b221b11672eb09044a91d75a524
diff --combined builtin/rebase.c
index 789d869842,9dc8475cd3..f1355efee7
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@@ -21,7 -21,6 +21,7 @@@
  #include "diff.h"
  #include "wt-status.h"
  #include "revision.h"
 +#include "commit-reach.h"
  #include "rerere.h"
  
  static char const * const builtin_rebase_usage[] = {
@@@ -55,7 -54,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);