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-branch.c | |
| parent | 53a1116c611e9e717d90e1406b29d97648460773 (diff) | |
| download | git-f7aec129fa78e39e200352502377f57952516f98.tar.gz git-f7aec129fa78e39e200352502377f57952516f98.tar.xz | |
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-branch.c')
| -rw-r--r-- | builtin-branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-branch.c b/builtin-branch.c index 1a03d5f35..9f5799206 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -586,7 +586,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) OPT_BIT('m', NULL, &rename, "move/rename a branch and its reflog", 1), OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2), OPT_BOOLEAN('l', NULL, &reflog, "create the branch's reflog"), - OPT_BOOLEAN('f', NULL, &force_create, "force creation (when already exists)"), + OPT_BOOLEAN('f', "force", &force_create, "force creation (when already exists)"), { OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref, "commit", "print only not merged branches", |