Sync with maint

diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index f9237323331e992a58cee0af79090a7bbeec434c..9ae898bc1d7d301983893e6df404c696b80a87f5 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" \