diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 402ff3782c..fb12b03b20 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*)