diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index c9604a67d14adb..c815a2412c2f33 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -7,12 +7,12 @@
 
 case "$action" in
 continue)
-	git am --resolved --3way --resolvemsg="$resolvemsg" &&
+	git am --resolved --resolvemsg="$resolvemsg" &&
 	move_to_original_branch
 	exit
 	;;
 skip)
-	git am --skip -3 --resolvemsg="$resolvemsg" &&
+	git am --skip --resolvemsg="$resolvemsg" &&
 	move_to_original_branch
 	exit
 	;;