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>
This commit is contained in:
Uwe Kleine-K,Av(Bnig 2008-02-11 14:45:26 +01:00 committed by Junio C Hamano
parent 0ed50ceb48
commit 65ae89bc31

View file

@ -432,7 +432,7 @@ do
shift ;;
esac
;;
--merge)
-m|--merge)
# we use merge anyway
;;
-C*)