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>
Uwe Kleine-K,Av(Bnig committed
Feb 11, 2008 at 14:45 UTC
65ae89bc315753e7bb31e941e77e002003665bc0
1 file changed
+1
-1
git-rebase--interactive.sh
+1
-1
@@ -432,7 +432,7 @@ do
432
shift ;;
433
esac
434
;;
435
- --merge)
435
+ -m|--merge)
436
# we use merge anyway
437
;;
438
-C*)