diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-11-02 05:04:52 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 05:04:52 +0300 |
commit | 5ae50845d8a30d7db32e139ce04b712f9deb99cd (patch) | |
tree | 0b01b1bf5c765b894c5ab6482f143b318f5729bb /git.c | |
parent | 4ede3d42dfb57f9a41ac96a1f216c62eb7566cc2 (diff) | |
parent | ac7f467fef8b836084afdce5eded047c79a6858d (diff) |
Merge branch 'pk/rebase-in-c'
Rewrite of the "rebase" machinery in C.
* pk/rebase-in-c:
builtin/rebase: support running "git rebase <upstream>"
rebase: refactor common shell functions into their own file
rebase: start implementing it as a builtin
Diffstat (limited to 'git.c')
-rw-r--r-- | git.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -526,6 +526,12 @@ static struct cmd_struct commands[] = { { "push", cmd_push, RUN_SETUP }, { "range-diff", cmd_range_diff, RUN_SETUP | USE_PAGER }, { "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX}, + /* + * NEEDSWORK: Until the rebase is independent and needs no redirection + * to rebase shell script this is kept as is, then should be changed to + * RUN_SETUP | NEED_WORK_TREE + */ + { "rebase", cmd_rebase }, { "rebase--helper", cmd_rebase__helper, RUN_SETUP | NEED_WORK_TREE }, { "receive-pack", cmd_receive_pack }, { "reflog", cmd_reflog, RUN_SETUP }, |