]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 04efc8b) | patch
sequencer (rebase -i): allow fast-forwarding for edit/reword
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 2 Jan 2017 15:28:05 +0000 (16:28 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jan 2017 22:57:30 +0000 (14:57 -0800)
commitbcbb68be2e287209eb257de314d72d022712e4c9
tree9190d8dd1e46a4ee92dfaf86c01bf3a03f640b1etree | snapshot
parent04efc8b57c17ab31de1c4c53e52838659dfeecc5commit | diff
sequencer (rebase -i): allow fast-forwarding for edit/reword

The sequencer already knew how to fast-forward instead of
cherry-picking, if possible.

We want to continue to do this, of course, but in case of the 'reword'
command, we will need to call `git commit` after fast-forwarding.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.