diff options
| -rwxr-xr-x | git-rebase.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index fd0e7c498d..3945e06714 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -54,8 +54,13 @@ continue_merge () { if test -n "`git-diff-index HEAD`" then + if ! git-commit -C "`cat $dotest/current`" + then + echo "Commit failed, please do not call \"git commit\"" + echo "directly, but instead do one of the following: " + die "$RESOLVEMSG" + fi printf "Committed: %0${prec}d" $msgnum - git-commit -C "`cat $dotest/current`" else printf "Already applied: %0${prec}d" $msgnum fi |