diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-04-25 14:28:56 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-26 12:28:42 +0900 |
| commit | d1e8b0114bef98e8efe3f8d35430300ff9e00443 (patch) | |
| tree | 9d0b6aff06162167b92a938c8a270d3ae7dd0db8 /builtin/commit.c | |
| parent | 4c68e7ddb59457efe9d3a141dc600feda86cbe67 (diff) | |
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 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions