Update draft release notes to 1.8.4

diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index f84854f09a14b92790bad543cbe78c2662def9f7..34e3102fcbfa64ec101c1fe009c9b14a5976e4c2 100644 (file)
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -7,12 +7,12 @@ case "$action" in
 continue)
        git am --resolved --resolvemsg="$resolvemsg" &&
        move_to_original_branch
-       exit
+       return
        ;;
 skip)
        git am --skip --resolvemsg="$resolvemsg" &&
        move_to_original_branch
-       exit
+       return
        ;;
 esac
 
@@ -56,7 +56,7 @@ else
 
                As a result, git cannot rebase them.
                EOF
-               exit $?
+               return $?
        fi
 
        git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" <"$GIT_DIR/rebased-patches"
@@ -68,7 +68,7 @@ fi
 if test 0 != $ret
 then
        test -d "$state_dir" && write_basic_state
-       exit $ret
+       return $ret
 fi
 
 move_to_original_branch