From 65ae89bc315753e7bb31e941e77e002003665bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=1B=2CAv=1B=28Bnig?=
 <Uwe.Kleine-Koenig@digi.com>
Date: Mon, 11 Feb 2008 14:45:26 +0100
Subject: rebase -i: accept -m as advertised in the man page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Uwe Kleine-K,Av(Bnig <Uwe.Kleine-Koenig@digi.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 402ff37..fb12b03 100755
--- 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*)
-- 
cgit v0.10.2-6-g49f6