summaryrefslogtreecommitdiff
path: root/perl
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2018-04-25 14:28:56 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-26 12:28:42 +0900
commitd1e8b0114bef98e8efe3f8d35430300ff9e00443 (patch)
tree9d0b6aff06162167b92a938c8a270d3ae7dd0db8 /perl
parentsequencer: introduce the `merge` command (diff)
downloadtgif-d1e8b0114bef98e8efe3f8d35430300ff9e00443.tar.xz
sequencer: fast-forward `merge` commands, if possible
Just like with regular `pick` commands, if we are trying to rebase a merge commit, we now test whether the parents of said commit match HEAD and the commits to be merged, and fast-forward if possible. This is not only faster, but also avoids unnecessary proliferation of new objects. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'perl')
0 files changed, 0 insertions, 0 deletions