Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'pk/rebase-in-c-6-final'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 2 Nov 2018 02:04:56 +0000
(11:04 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 2 Nov 2018 02:04:56 +0000
(11:04 +0900)
The final step of rewriting "rebase -i" in C.
* pk/rebase-in-c-6-final:
rebase: default to using the builtin rebase
1
2
builtin/rebase.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
compact
(merge:
4b3517e
5541bd5
)
diff --combined
builtin/rebase.c
index 789d8698425b2faed583e3a446ac7d082252d282,9dc8475cd361af2ad712f4f53df3453df5f9bd45..f1355efee7a023b0080c4b952c7206f4db14b0c9
---
1
/
builtin/rebase.c
---
2
/
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);