summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1702b13)
raw | patch | inline | side by side (parent: 1702b13)
author | Willy Tarreau <w@1wt.eu> | |
Sun, 8 Aug 2010 05:13:32 +0000 (07:13 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 9 Aug 2010 18:51:50 +0000 (11:51 -0700) |
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>
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>
git-rebase.sh | patch | blob | history |
diff --git a/git-rebase.sh b/git-rebase.sh
index 2d88742cecc5037b945b5e01fba0674177ab6a74..1d38afdb10e24e11dc5428c5a38c27fe2c773a4d 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
--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)