Message ID | pull.294.git.gitgitgadget@gmail.com (mailing list archive) |
---|---|
Headers | show |
Series | rebase -r: support merge strategies other than recursive | expand |
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> 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-standing bug: the --onto option was simply ignored when passed > together with --rebase-merges and --root. For good measure, this patch > series addresses this bug, too. Very nice. > base-commit: 082ef75b7bfc90ac236afbb857a9552a026832b8 > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-294%2Fdscho%2Frebase-r-with-strategies-v1 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-294/dscho/rebase-r-with-strategies-v1 > Pull-Request: https://github.com/gitgitgadget/git/pull/294
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. This looks like a great improvement. I'm glad to see --rebase-merges gaining feature parity with --preserve-merges.