diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-01-02 16:28:34 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-09 14:57:30 -0800 |
| commit | 9d7bf3cf993ab59e0f9d7150534213f57dd12741 (patch) | |
| tree | 5894bfc7cbecbfcbf478bcb285ebcb19867bbbed /t/t4013/diff.format-patch_--inline_--stdout_initial..master | |
| parent | sequencer (rebase -i): respect strategy/strategy_opts settings (diff) | |
| download | git-9d7bf3cf993ab59e0f9d7150534213f57dd12741.tar.gz git-9d7bf3cf993ab59e0f9d7150534213f57dd12741.zip | |
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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master')
0 files changed, 0 insertions, 0 deletions