[PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty
- From
- Phillip Wood <phillip.wood@talktalk.net>
- Date
- Mar 20, 2018, 10:11 UTC
- Message-ID
- <20180320101114.17663-1-phillip.wood@talktalk.net>
From: Phillip Wood <phillip.wood@dunelm.org.uk>
These patches apply on top of js/rebase-recreate-merge. They extend the --keep-empty fix from maint [1] to work with --recreate-merges.
[1] https://public-inbox.org/git/20180320100315.15261-3-phillip.wood@talktalk.net/T/#u
Phillip Wood (2): add failing test for rebase --recreate-merges --keep-empty rebase --recreate-merges --keep-empty: don't prune empty commits
sequencer.c | 30 ++++++++++++++++-------------- t/t3421-rebase-topology-linear.sh | 3 ++- 2 files changed, 18 insertions(+), 15 deletions(-)
-- 2.16.2