Skip to content

Commit

Permalink
git-rebase: fix typo when parsing --force-rebase
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Willy Tarreau authored and Junio C Hamano committed Aug 9, 2010
1 parent 1702b13 commit 1bc6bf6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 1bc6bf6

Please sign in to comment.