git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 92d0d74)
builtin rebase: add support for custom merge strategies
authorPratik Karki <redacted>
Tue, 4 Sep 2018 22:00:11 +0000 (15:00 -0700)
committerJunio C Hamano <redacted>
Thu, 11 Oct 2018 05:12:45 +0000 (14:12 +0900)
commitba1905a5fefd96b88beb28ba26a8edc6a2c3fe02
treecc29c2e6fea75772c6a941353d3e3a99069146cbtree | snapshot
parent92d0d74e8d703d0f9c0bce779d5e25bb3c25f7dfcommit | diff
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 <redacted>
Signed-off-by: Johannes Schindelin <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/rebase.c diff | blob | history
git clone https://git.99rst.org/PROJECT