diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:39:13 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:39:14 -0700 |
commit | 38dac334d78fd8f0568180b714554bee1b23b6a0 (patch) | |
tree | 1a2c48b62b2f872dc345806b5a2ac8dfc4d08766 /git.c | |
parent | c3d4c20c7d862fb168b4b2126443e13c55737507 (diff) | |
parent | 80dfc9242ebaba357ffedececd88641a1a752411 (diff) | |
download | git-38dac334d78fd8f0568180b714554bee1b23b6a0.tar.gz |
Merge branch 'js/rebase-cleanup'
A few leftover cleanup to "git rebase" in C.
* js/rebase-cleanup:
git: mark cmd_rebase as requiring a worktree
rebase: fix white-space
Diffstat (limited to 'git.c')
-rw-r--r-- | git.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -551,12 +551,7 @@ 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", cmd_rebase, RUN_SETUP | NEED_WORK_TREE }, { "rebase--interactive", cmd_rebase__interactive, RUN_SETUP | NEED_WORK_TREE }, { "receive-pack", cmd_receive_pack }, { "reflog", cmd_reflog, RUN_SETUP }, |