diff options
| author | Willy Tarreau <w@1wt.eu> | 2010-08-08 07:13:32 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-09 11:51:50 -0700 |
| commit | 1bc6bf6dea0ec3703f2844d838207f2b31ef4ff8 (patch) | |
| tree | 568baf125f5362026516af160f964a6768924a99 | |
| parent | 1702b1381e2a7193d74f6dc649c86e15ec72b4dc (diff) | |
| download | git-1bc6bf6dea0ec3703f2844d838207f2b31ef4ff8.tar.gz | |
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>
| -rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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) |