From 65ae89bc315753e7bb31e941e77e002003665bc0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20Kleine-K=1B=2CAv=1B=28Bnig?= Date: Mon, 11 Feb 2008 14:45:26 +0100 Subject: [PATCH] rebase -i: accept -m as advertised in the man page MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Uwe Kleine-K,Av(Bnig Signed-off-by: Junio C Hamano --- git-rebase--interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 402ff3782..fb12b03b2 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*) -- 2.30.2