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
