| commit | ff74126c03a8dfd04e7533573a5c420f2a7112ac | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Fri, 10 Oct 2008 11:42:12 +0000 (10 13:42 +0200) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 10 Oct 2008 15:32:03 +0000 (10 08:32 -0700) | ||
| tree | deb3f4fa7b69bf1574706bbc57c62cd5b984c820 | treesnapshot (tar.gz zip) |
| parent | b8eecafd888d219633f4c29e8b6a90fc21a46dfd | commitdiff |
rebase -i: do not fail when there is no commit to cherry-pick
In case there is no commit to apply (for example because you rebase to
upstream and all your local patches have been applied there), do not
fail. The non-interactive rebase already behaves that way.
Do this by introducing a new command, "noop", which is substituted for
an empty commit list, so that deleting the commit list can still abort
as before.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
In case there is no commit to apply (for example because you rebase to
upstream and all your local patches have been applied there), do not
fail. The non-interactive rebase already behaves that way.
Do this by introducing a new command, "noop", which is substituted for
an empty commit list, so that deleting the commit list can still abort
as before.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| git-rebase--interactive.sh | diffblobblamehistory | |
| t/t3404-rebase-interactive.sh | diffblobblamehistory |