diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-02 03:04:52 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 03:04:52 +0100 |
| commit | 5ae50845d8a30d7db32e139ce04b712f9deb99cd (patch) | |
| tree | 0b01b1bf5c765b894c5ab6482f143b318f5729bb /builtin.h | |
| parent | Seventh batch for 2.20 (diff) | |
| parent | builtin/rebase: support running "git rebase <upstream>" (diff) | |
| download | git-5ae50845d8a30d7db32e139ce04b712f9deb99cd.tar.xz git-5ae50845d8a30d7db32e139ce04b712f9deb99cd.zip | |
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 'builtin.h')
| -rw-r--r-- | builtin.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -204,6 +204,7 @@ extern int cmd_pull(int argc, const char **argv, const char *prefix); extern int cmd_push(int argc, const char **argv, const char *prefix); extern int cmd_range_diff(int argc, const char **argv, const char *prefix); extern int cmd_read_tree(int argc, const char **argv, const char *prefix); +extern int cmd_rebase(int argc, const char **argv, const char *prefix); extern int cmd_rebase__helper(int argc, const char **argv, const char *prefix); extern int cmd_receive_pack(int argc, const char **argv, const char *prefix); extern int cmd_reflog(int argc, const char **argv, const char *prefix); |