Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/git-am.sh b/git-am.sh
index 351b4f86fa9f0690d1afdfd90aa0ad820590fe78..d3390755fc687a611e89320a7bbfb4ead512c863 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -221,6 +221,9 @@ then
        resume=yes
 
        case "$skip,$abort" in
+       t,t)
+               die "Please make up your mind. --skip or --abort?"
+               ;;
        t,)
                git rerere clear
                git read-tree --reset -u HEAD HEAD
@@ -229,6 +232,10 @@ then
                git update-ref ORIG_HEAD $orig_head
                ;;
        ,t)
+               if test -f "$dotest/rebasing"
+               then
+                       exec git rebase --abort
+               fi
                git rerere clear
                test -f "$dotest/dirtyindex" || {
                        git read-tree --reset -u HEAD ORIG_HEAD