From: Uwe Kleine-König <uwe.kleine-koenig@digi.com>
Date: Mon, 11 Feb 2008 13:45:26 GMT
Subject: [PATCH] rebase -i: accept -m as advertised in the man page
Message-ID: <1202737526-18210-1-git-send-email-Uwe.Kleine-Koenig@digi.com>

Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
---
 git-rebase--interactive.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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*)
-- 
1.5.4