rebase -r: support octopus merges
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest3 patches 16 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/3 | merge: allow reading the merge commit message from a fileDocumentation/ builtin/ | +41 | 3 replies | |
| 2/3 | rebase --rebase-merges: add support for octopus mergessequencer.c t/ | +159 | 4 replies | |
| 3/3 | rebase --rebase-merges: adjust man page for octopus supportDocumentation/ | +4 | 2 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/3] rebase -r: support octopus merges
The --rebase-merges option of git rebase generates todo lists that include the merge commits that are to be rebased.
To keep things simpler to review, I decided to support only regular, 2-parent merge commits first.
With this patch series, support is extended to cover also octopus merges.
Johannes Schindelin (3):
merge: allow reading the merge commit message from a file rebase --rebase-merges: add support for octopus merges rebase --rebase-merges: adjust man page for octopus support
Documentation/git-merge.txt | 10 ++- Documentation/git-rebase.txt | 7 +- builtin/merge.c | 32 +++++++ sequencer.c | 168 ++++++++++++++++++++++++++--------- t/t3430-rebase-merges.sh | 34 +++++++ 5 files changed, 204 insertions(+), 47 deletions(-)
base-commit: e3331758f12da22f4103eec7efe1b5304a9be5e9
Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-8%2Fdscho%2Fsequencer-and-octopus-merges-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-8/dscho/sequencer-and-octopus-merges-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/8
Signature · 1 line
gitgitgadget