rebase: allow a hook to refuse rebasing.

[git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index 731ab1fffa4fbe563ab5e2c09cbbdca07e16cac4..98b9215f700b5cb6a01e39f0f0f0100dcb6e395e 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -88,6 +88,10 @@ fall_back_3way () {
     # saying that we reverted all those changes.
 
     git-merge-resolve $orig_tree -- HEAD $his_tree || {
+           if test -d "$GIT_DIR/rr-cache"
+           then
+               git-rerere
+           fi
            echo Failed to merge in the changes.
            exit 1
     }