diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-10-10 13:42:12 +0200 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-10-10 08:32:03 -0700 |
| commit | ff74126c03a8dfd04e7533573a5c420f2a7112ac (patch) | |
| tree | deb3f4fa7b69bf1574706bbc57c62cd5b984c820 /t/t7602-merge-octopus-many.sh | |
| parent | test-lib: fix color reset in say_color() (diff) | |
| download | tgif-ff74126c03a8dfd04e7533573a5c420f2a7112ac.tar.xz | |
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>
Diffstat (limited to 't/t7602-merge-octopus-many.sh')
0 files changed, 0 insertions, 0 deletions