Reimplement rebase --merge via interactive machinery
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v5 Latest8 patches 0 repliesNew
- v48 patches 25 repliesSuperseded
- v37 patches 4 repliesSuperseded
Earlier versions · 2
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v2 | 2 patches | 9 replies | Superseded | |
| v1 RFC | 3 patches | 14 replies | Superseded |
Patches in v5 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/8 | rebase: make builtin and legacy script error messages the samebuiltin/ git-legacy-rebase.sh | +11 | 0 replies | |
| 2/8 | rebase: fix incompatible options error messagebuiltin/ git-legacy-rebase.sh | +5 | 0 replies | |
| 3/8 | t5407: add a test demonstrating how interactive handles --skip differentlyt/ | +31 | 0 replies | |
| 4/8 | am, rebase--merge: do not overlook --skip'ed commits with post-rewritebuiltin/ git-rebase--merge.sh t/ | +14 | 0 replies | |
| 5/8 | git-rebase, sequencer: extend --quiet option for the interactive machinerybuiltin/ git-legacy-rebase.sh git-rebase--common.sh +2 more | +17 | 0 replies | |
| 6/8 | git-legacy-rebase: simplify unnecessary triply-nested ifgit-legacy-rebase.sh | +8 | 0 replies | |
| 7/8 | rebase: define linearization ordering and enforce itgit-rebase--am.sh git-rebase--merge.sh t/ | +8 | 0 replies | |
| 8/8 | rebase: implement --merge via the interactive machinery.gitignore Documentation/ Makefile +7 more | +43 | 0 replies |
Reviews trailers per patch
All 8 patches have a Reviewed-by or Acked-by.
| Patch | Johannes Schindelin |
|---|---|
| 1/8 | A-b |
| 2/8 | A-b |
| 3/8 | A-b |
| 4/8 | A-b |
| 5/8 | A-b |
| 6/8 | A-b |
| 7/8 | A-b |
| 8/8 | A-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v5 0/8] Reimplement rebase --merge via interactive machinery
This series continues the work of making rebase more self-consistent by removing inconsistencies between different backends. In particular, this series focuses on making the merge machinery behave like the interactive machinery (though a few differences between the am and interactive backends are also fixed along the way), and ultimately removes the merge backend in favor of reimplementing the relevant options on top of the interactive machinery.
Differences since v4:
- Included Dscho's Acked-by (from
https://public-inbox.org/git/[email protected]/)
Elijah Newren (8):
rebase: make builtin and legacy script error messages the same
rebase: fix incompatible options error message
t5407: add a test demonstrating how interactive handles --skip
differently
am, rebase--merge: do not overlook --skip'ed commits with post-rewrite git-rebase, sequencer: extend --quiet option for the interactive
machinery
git-legacy-rebase: simplify unnecessary triply-nested if
rebase: define linearization ordering and enforce it
rebase: implement --merge via the interactive machinery
.gitignore | 1 - Documentation/git-rebase.txt | 17 +--- Makefile | 1 - builtin/am.c | 9 ++ builtin/rebase.c | 30 ++---- git-legacy-rebase.sh | 65 ++++++------ git-rebase--am.sh | 2 +- 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 | 15 ++- t/t5407-post-rewrite-hook.sh | 34 +++++++ t/t9903-bash-prompt.sh | 2 +- 17 files changed, 121 insertions(+), 340 deletions(-) delete mode 100644 git-rebase--merge.sh
Signature · 1 line
2.20.1.310.g17ca096f17