DORMANTno replies

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

From: Uwe Kleine-König <hidden>
Date: 2016-06-15 22:44:12
Subsystem: the rest · Maintainer: Linus Torvalds

Signed-off-by: Uwe Kleine-König <redacted>
---
 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 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help