From: Johannes Schindelin Date: Mon, 2 Jan 2017 15:28:34 +0000 (+0100) Subject: sequencer (rebase -i): allow rescheduling commands X-Git-Tag: v2.12.0-rc0~38^2~10 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9d7bf3cf993ab59e0f9d7150534213f57dd12741?hp=9d7bf3cf993ab59e0f9d7150534213f57dd12741 sequencer (rebase -i): allow rescheduling commands The interactive rebase has the very special magic that a cherry-pick that exits with a status different from 0 and 1 signifies a failure to even record that a cherry-pick was started. This can happen e.g. when a fast-forward fails because it would overwrite untracked files. In that case, we must reschedule the command that we thought we already had at least started successfully. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano ---