diff options
Diffstat (limited to 'git-rebase--merge.sh')
| -rw-r--r-- | git-rebase--merge.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index b10f2cf21b..5381857c59 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. # @@ -25,7 +27,7 @@ continue_merge () { cmt=`cat "$state_dir/current"` if ! git diff-index --quiet --ignore-submodules HEAD -- then - if ! git commit --no-verify -C "$cmt" + if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} --no-verify -C "$cmt" then echo "Commit failed, please do not call \"git commit\"" echo "directly, but instead do one of the following: " @@ -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 |