diff options
| author | Uwe Kleine-K,Av(Bnig <Uwe.Kleine-Koenig@digi.com> | 2008-02-11 14:45:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-11 12:18:53 -0800 |
| commit | 65ae89bc315753e7bb31e941e77e002003665bc0 (patch) | |
| tree | d941de67b82bae18d1d388eee91cb9b3c8913621 | |
| parent | 0ed50ceb48662e1d2b4e131f1ed79252062547dd (diff) | |
| download | git-65ae89bc315753e7bb31e941e77e002003665bc0.tar.gz git-65ae89bc315753e7bb31e941e77e002003665bc0.tar.xz | |
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>
| -rwxr-xr-x | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 402ff3782..fb12b03b2 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*) |