From 1bc6bf6dea0ec3703f2844d838207f2b31ef4ff8 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 8 Aug 2010 07:13:32 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase.sh b/git-rebase.sh index 2d88742cec..1d38afdb10 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) -- 2.11.4.GIT