From: Willy Tarreau <w@1wt.eu>
Date: Sun, 8 Aug 2010 05:13:32 +0000 (+0200)
Subject: git-rebase: fix typo when parsing --force-rebase
X-Git-Tag: v1.7.2.2~17
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1bc6bf6dea0ec3703f2844d838207f2b31ef4ff8;p=git.git

git-rebase: fix typo when parsing --force-rebase

Due to two missing hyphens, The "force" keyword on the command line
would be taken as an alias for the --force-rebase option.

Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase.sh b/git-rebase.sh
index 2d88742ce..1d38afdb1 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -346,7 +346,7 @@ do
 	--root)
 		rebase_root=t
 		;;
-	-f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase|--no-ff)
+	-f|--f|--fo|--for|--forc|--force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase|--no-ff)
 		force_rebase=t
 		;;
 	--rerere-autoupdate|--no-rerere-autoupdate)