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:
parent
0ed50ceb48
commit
65ae89bc31
@ -432,7 +432,7 @@ do
|
|||||||
shift ;;
|
shift ;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
--merge)
|
-m|--merge)
|
||||||
# we use merge anyway
|
# we use merge anyway
|
||||||
;;
|
;;
|
||||||
-C*)
|
-C*)
|
||||||
|
Loading…
Reference in New Issue
Block a user