Imported Upstream version 2.4.7

[platform/upstream/git.git] / git-rebase--am.sh

diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index f923732..9ae898b 100644 (file)
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -78,7 +78,7 @@ else
 
                As a result, git cannot rebase them.
                EOF
-               return $?
+               return $ret
        fi
 
        git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \