[PATCH] rebase -i: accept -m as advertised in the man page

Uwe Kleine-König· Feb 11, 2008, 13:45 UTC · lore

Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
---
 git-rebase--interactive.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to git-rebase--interactive.sh +1 −1

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

-- 
1.5.4

patchrebase -i: accept -m as advertised in the man page