| Message ID | 20181108060158.27145-1-newren@gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Reimplement rebase --merge via interactive machinery | expand |
On Wed, Nov 7, 2018 at 10:02 PM Elijah Newren <newren@gmail.com> wrote: > > Now that the rewrite-interactive-rebases-in-C series have finally > merged to master, this series deletes git-rebase--merge.sh and > reimplements the --merge behavior on top of the interactive machinery. > > Differences since v1: > - Updated code to hook into builtin/rebase.C instead of git-rebase.sh > > (No range-diff provided, because it has been months since v1, and v1 > was only RFC and was only discussed at a high level.) Actually, that's not correct; it's been so long that I forgot. Dscho and Phillip both reviewed it and I updated my series at the time with their suggestions, but didn't re-submit because it depended on so many other series and conflicted with the rebase-in-C work. So other differences include the changes I made to address their feedback, but...even if I dug up the old v1 and created a range-diff against it I'm not so sure it'd be helpful. If anyone thinks it would be, holler and I'll generate it. Original series here: https://public-inbox.org/git/20180607171344.23331-1-newren@gmail.com/
Now that the rewrite-interactive-rebases-in-C series have finally merged to master, this series deletes git-rebase--merge.sh and reimplements the --merge behavior on top of the interactive machinery. Differences since v1: - Updated code to hook into builtin/rebase.C instead of git-rebase.sh (No range-diff provided, because it has been months since v1, and v1 was only RFC and was only discussed at a high level.) Elijah Newren (2): git-rebase, sequencer: extend --quiet option for the interactive machinery rebase: Implement --merge via git-rebase--interactive .gitignore | 1 - Documentation/git-rebase.txt | 17 +--- Makefile | 1 - builtin/rebase.c | 15 ++- git-legacy-rebase.sh | 57 +++++------ git-rebase--common.sh | 2 +- git-rebase--merge.sh | 164 ------------------------------ sequencer.c | 23 +++-- sequencer.h | 1 + t/t3406-rebase-message.sh | 7 +- t/t3420-rebase-autostash.sh | 78 ++------------ t/t3421-rebase-topology-linear.sh | 10 +- t/t3425-rebase-topology-merges.sh | 6 +- t/t5407-post-rewrite-hook.sh | 1 + t/t9903-bash-prompt.sh | 2 +- 15 files changed, 67 insertions(+), 318 deletions(-) delete mode 100644 git-rebase--merge.sh