builtin rebase: add support for custom merge strategies
authorPratik Karki <predatoramigo@gmail.com>
Tue, 4 Sep 2018 22:00:11 +0000 (15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Oct 2018 05:12:45 +0000 (14:12 +0900)
commitba1905a...fefd96b88beb28ba26a8edc6a2c3fe02
treecc29c2e...fea75772c6a941353d3e3a99069146cbcopy hash to clipboard (tree)
parent92d0d74...8d703d0f9c0bce779d5e25bb3c25f7dfcopy hash to clipboard (diff)
builtin/rebase.c