diff options
Diffstat (limited to 'git-rebase--merge.sh')
| -rw-r--r-- | git-rebase--merge.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index dc599077f..16d18176e 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -3,8 +3,6 @@ # Copyright (c) 2010 Junio C Hamano. # -. git-sh-setup - prec=4 read_state () { @@ -98,7 +96,6 @@ finish_rb_merge () { "$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten fi fi - rm -r "$state_dir" say All done. } @@ -112,7 +109,7 @@ continue) continue_merge done finish_rb_merge - exit + return ;; skip) read_state @@ -124,7 +121,7 @@ skip) continue_merge done finish_rb_merge - exit + return ;; esac |