summaryrefslogtreecommitdiffstats
path: root/upload-pack.h
diff options
context:
space:
mode:
authorPratik Karki <predatoramigo@gmail.com>2018-09-05 00:00:11 +0200
committerJunio C Hamano <gitster@pobox.com>2018-10-11 07:12:45 +0200
commitba1905a5fefd96b88beb28ba26a8edc6a2c3fe02 (patch)
treecc29c2e6fea75772c6a941353d3e3a99069146cb /upload-pack.h
parentbuiltin rebase: support `fork-point` option (diff)
downloadgit-ba1905a5fefd96b88beb28ba26a8edc6a2c3fe02.tar.xz
git-ba1905a5fefd96b88beb28ba26a8edc6a2c3fe02.zip
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 'upload-pack.h')
0 files changed, 0 insertions, 0 deletions