Re: [PATCH 00/12] rebase -r: support merge strategies other than recursive

2019-07-26 Thread brian m. carlson
On 2019-07-25 at 10:11:14, Johannes Schindelin via GitGitGadget wrote: > This is the most notable shortcoming that --rebase-merges has, still, > relative to --preserve-merges' capabilities: it does not support passing > custom merge strategies or custom merge strategy options. > > Let's fix this.

Re: [PATCH 00/12] rebase -r: support merge strategies other than recursive

2019-07-25 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > ... As a consolation to myself, this work was actually worth it, surprising as > that may look. Not only is t3427 now really easy to understand, adding that > test case for --rebase-merges -Xsubtree tickled the sequencer enough to > reveal a long-s

[PATCH 00/12] rebase -r: support merge strategies other than recursive

2019-07-25 Thread Johannes Schindelin via GitGitGadget
This is the most notable shortcoming that --rebase-merges has, still, relative to --preserve-merges' capabilities: it does not support passing custom merge strategies or custom merge strategy options. Let's fix this. While working on this patch series, of course I tried to copy-edit the test case