]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
sequencer (rebase -i): allow continuing with staged changes
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 2 Jan 2017 15:27:21 +0000 (16:27 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jan 2017 22:57:29 +0000 (14:57 -0800)
commit9d93ccd1d2d2d40a3c7ecc76740caf28683144ac
tree55a9c7fec7a25b0c4072f34b3025246f03d3574e
parent0473f28ad700b9bf4e7dd279f33950fdc968dfa2
sequencer (rebase -i): allow continuing with staged changes

When an interactive rebase is interrupted, the user may stage changes
before continuing, and we need to commit those changes in that case.

Please note that the nested "if" added to the sequencer_continue() is
not combined into a single "if" because it will be extended with an
"else" clause in a later patch in this patch series.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c