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>
git-mirror · Feb 11, 2008 · 65ae89b · 65ae89b
1 parent 0ed50ce
commit 65ae89b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
@@ -432,7 +432,7 @@ do
 			shift ;;
 		esac
 		;;
-	--merge)
+	-m|--merge)
 		# we use merge anyway
 		;;
 	-C*)