From: Uwe Kleine-K,Av(Bnig <Uwe.Kleine-Koenig@digi.com>
Date: Mon, 11 Feb 2008 13:45:26 +0000 (+0100)
Subject: rebase -i: accept -m as advertised in the man page
X-Git-Tag: v1.5.4.2~58
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/65ae89bc315753e7bb31e941e77e002003665bc0?hp=0ed50ceb48662e1d2b4e131f1ed79252062547dd

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>
---

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 402ff3782c..fb12b03b20 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*)