diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2009-08-29 11:05:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-29 14:08:03 -0700 |
| commit | f7aec129fa78e39e200352502377f57952516f98 (patch) | |
| tree | b6aa55c7e3089c2fe2da9eb1dcd1dfac4902ec2e /builtin-checkout.c | |
| parent | 53a1116c611e9e717d90e1406b29d97648460773 (diff) | |
| download | git-f7aec129fa78e39e200352502377f57952516f98.tar.gz | |
UI consistency: allow --force for where -f means force
git branch, checkout, clean, mv and tag all have an option -f to override
certain checks. This patch makes them accept the long option --force as
a synonym.
While we're at it, document that checkout support --quiet as synonym for
its short option -q.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-checkout.c')
| -rw-r--r-- | builtin-checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index c6d6ac99f6..36e2116ea2 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -584,7 +584,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) 2), OPT_SET_INT('3', "theirs", &opts.writeout_stage, "stage", 3), - OPT_BOOLEAN('f', NULL, &opts.force, "force"), + OPT_BOOLEAN('f', "force", &opts.force, "force"), OPT_BOOLEAN('m', "merge", &opts.merge, "merge"), OPT_STRING(0, "conflict", &conflict_style, "style", "conflict style (merge or diff3)"), |