Preparing a patch series for submission (as explained under INTERACTIVE MODE in the git rebase manual) sometimes involves discarding commits representing changes that turned out to be a bad idea. Usually this is quite simple to do by deleting the appropriate "pick" lines, but if all commits are removed then the "remove everything means abort" logic kicks in and the rebase is cancelled. One can override that behavior by adding a line with the text "noop". This is a follow-up to v1.6.0.3~21 (rebase -i: do not fail when there is no commit to cherry-pick, 2008-10-10). Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx> --- git-rebase--interactive.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 09aeecf..d9dfc75 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -1025,6 +1025,7 @@ first and then run 'git rebase --continue' again." # # If you remove a line here THAT COMMIT WILL BE LOST. # However, if you remove everything, the rebase will be aborted. +# Use the "noop" command if you really want to remove all commits. # EOF -- 1.7.4.rc2 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html