From: Willy Tarreau Date: Sun, 08 Aug 2010 05:30:01 GMT Subject: [PATCH] minor typo fix for git-rebase Message-ID: <20100808053001.GD8115@1wt.eu> Hi ! I found the minor typo below while reading the script. Cheers, Willy -------- From 54fbcaabbd2c9d6da1b51a35114838797585cb06 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 8 Aug 2010 07:13:32 +0200 Subject: 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 --- git-rebase.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index 2d88742..1d38afd 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) -- 1.6.4.4