]> git.ipfire.org Git - thirdparty/git.git/commit
builtin rebase: try to fast forward when possible
authorPratik Karki <predatoramigo@gmail.com>
Tue, 4 Sep 2018 21:27:16 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Sep 2018 18:55:43 +0000 (11:55 -0700)
commit9a48a615b47d940764e00c872ddbae601a1e5f8a
treed5b8aa4c45e1f13ecd7e45d64fffdb221920ef92
parente0333e5c63f347c5032fde05bddf711061e55e59
builtin rebase: try to fast forward when possible

In this commit, we add support to fast forward.

Note: we will need the merge base later, therefore the call to
can_fast_forward() really needs to be the first one when testing whether
we can skip the rebase entirely (otherwise, it would make more sense to
skip the possibly expensive operation if, say, running an interactive
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>
builtin/rebase.c