On 20/03/18 15:42, Johannes Schindelin wrote: > Hi Phillip, > > On Tue, 20 Mar 2018, Phillip Wood wrote: > >> From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> >> >> These patches apply on top of js/rebase-recreate-merge. They extend >> the --keep-empty fix from maint [1] to work with --recreate-merges. > > As indicated in another reply, I'd rather rebase the --recreate-merges > patches on top of your --keep-empty patch series. This obviously means > that I would fold essentially all of your 2/2 changes into my > "rebase-helper --make-script: introduce a flag to recreate merges" > > The 1/2 (with s/failure/success/g) would then be added to the > --recreate-merges patch series at the end. > > Would that be okay with you? Yes, that's fine, it would give a clearer history Best Wishes Phillip
