diff options
| author |  Pratik Karki <predatoramigo@gmail.com> | 2018-09-04 15:00:11 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-10-11 14:12:45 +0900 |
| commit | ba1905a5fefd96b88beb28ba26a8edc6a2c3fe02 (patch) | |
| tree | cc29c2e6fea75772c6a941353d3e3a99069146cb /ci | |
| parent | builtin rebase: support `fork-point` option (diff) | |
| download | tgif-ba1905a5fefd96b88beb28ba26a8edc6a2c3fe02.tar.xz | |
builtin rebase: add support for custom merge strategies
When running a rebase in non-am mode, it uses the recursive merge to
cherry-pick the commits, and the rebase command allows to configure
the merge strategy to be used in this operation.
This commit adds that support to the builtin rebase.
Signed-off-by: Pratik Karki <predatoramigo@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci')
0 files changed, 0 insertions, 0 deletions