rebase -i: accept -m as advertised in the man page

Signed-off-by: Uwe Kleine-K,Av(Bnig <Uwe.Kleine-Koenig@digi.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago · 65ae89bc31
1 changed files with 1 additions and 1 deletions
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@ -432,7 +432,7 @@ do
				@@ -432,7 +432,7 @@ do
 			shift ;;
 		esac
 		;;
-	--merge)
+	-m|--merge)
 		# we use merge anyway
 		;;
 	-C*)