rebase -i: accept -m as advertised in the man page
authorUwe Kleine-K\e,Av\e(Bnig <Uwe.Kleine-Koenig@digi.com>
Mon, 11 Feb 2008 13:45:26 +0000 (14:45 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Feb 2008 20:18:53 +0000 (12:18 -0800)
Signed-off-by: Uwe Kleine-K\e,Av\e(Bnig <Uwe.Kleine-Koenig@digi.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh
index 402ff3782c0aaa472a2013ff3a9bef44a6cd8550..fb12b03b201836bb4c3b43a5d1120b3305d1ccf0 100755 (executable)
@@ -432,7 +432,7 @@ do
                        shift ;;
                esac
                ;;
-       --merge)
+       -m|--merge)
                # we use merge anyway
                ;;
        -C*)