From: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Phillip Wood" <phillip.wood@dunelm.org.uk>
Subject: [PATCH 0/4] rebase -r: some merge related fixes
Date: Fri, 13 Aug 2021 13:07:29 +0000 [thread overview]
Message-ID: <pull.1015.git.1628860053.gitgitgadget@gmail.com> (raw)
This is a collection of merge related fixes for rebase -r
* Make merge -c behave like reword.
* When fast-forwarding a merge don't leave .git/MERGE_MSG around (reported
by Gábor)
* Make merge -c work when with --strategy
Phillip Wood (4):
rebase -r: make 'merge -c' behave like reword
rebase -i: Add another reword test
rebase -r: don't write .git/MERGE_MSG when fast-forwarding
rebase -r: fix merge -c with a merge strategy
sequencer.c | 106 ++++++++++++++++++----------------
t/lib-rebase.sh | 56 ++++++++++++++++++
t/t3404-rebase-interactive.sh | 13 +++++
t/t3430-rebase-merges.sh | 38 +++++++++---
4 files changed, 155 insertions(+), 58 deletions(-)
base-commit: 66262451ec94d30ac4b80eb3123549cf7a788afd
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1015%2Fphillipwood%2Fwip%2Fsequencer-merge-c-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1015/phillipwood/wip/sequencer-merge-c-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1015
--
gitgitgadget
next reply other threads:[~2021-08-13 13:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-13 13:07 Phillip Wood via GitGitGadget [this message]
2021-08-13 13:07 ` [PATCH 1/4] rebase -r: make 'merge -c' behave like reword Phillip Wood via GitGitGadget
2021-08-13 13:07 ` [PATCH 2/4] rebase -i: Add another reword test Phillip Wood via GitGitGadget
2021-08-13 13:07 ` [PATCH 3/4] rebase -r: don't write .git/MERGE_MSG when fast-forwarding Phillip Wood via GitGitGadget
2021-08-17 17:26 ` SZEDER Gábor
2021-08-19 10:09 ` Phillip Wood
2021-08-13 13:07 ` [PATCH 4/4] rebase -r: fix merge -c with a merge strategy Phillip Wood via GitGitGadget
2021-08-14 22:43 ` [PATCH 0/4] rebase -r: some merge related fixes Johannes Schindelin
2021-08-19 10:07 ` Phillip Wood
2021-08-20 15:40 ` [PATCH v2 " Phillip Wood via GitGitGadget
2021-08-20 15:40 ` [PATCH v2 1/4] rebase -r: make 'merge -c' behave like reword Phillip Wood via GitGitGadget
2021-08-20 15:40 ` [PATCH v2 2/4] rebase -i: Add another reword test Phillip Wood via GitGitGadget
2021-08-20 15:40 ` [PATCH v2 3/4] rebase -r: don't write .git/MERGE_MSG when fast-forwarding Phillip Wood via GitGitGadget
2021-08-20 15:40 ` [PATCH v2 4/4] rebase -r: fix merge -c with a merge strategy Phillip Wood via GitGitGadget
2021-08-24 13:33 ` [PATCH v2 0/4] rebase -r: some merge related fixes Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1015.git.1628860053.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=phillip.wood@dunelm.org.uk \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).