diff options
Diffstat (limited to 'git-rebase--merge.sh')
| -rw-r--r-- | git-rebase--merge.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index b10f2cf21b..e7d96de9ad 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -1,4 +1,6 @@ -#!/bin/sh +# This shell script fragment is sourced by git-rebase to implement +# its merge-based non-interactive mode that copes well with renamed +# files. # # Copyright (c) 2010 Junio C Hamano. # @@ -96,7 +98,6 @@ finish_rb_merge () { "$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten fi fi - rm -r "$state_dir" say All done. } @@ -110,7 +111,7 @@ continue) continue_merge done finish_rb_merge - exit + return ;; skip) read_state @@ -122,7 +123,7 @@ skip) continue_merge done finish_rb_merge - exit + return ;; esac |