summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2010-11-08 18:01:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-15 18:04:43 (GMT)
commit76946b76fe3d26507d61cae97aa0676fad24ed92 (patch)
treecb637a3012a3b7f5f448ff660106ba1e2595da09 /builtin/branch.c
parentd52ee6e6131f65bb4360743ebea2e7b400b544e4 (diff)
downloadgit-76946b76fe3d26507d61cae97aa0676fad24ed92.zip
git-76946b76fe3d26507d61cae97aa0676fad24ed92.tar.gz
git-76946b76fe3d26507d61cae97aa0676fad24ed92.tar.bz2
add OPT__FORCE
Add OPT__FORCE as a helper macro in the same spirit as OPT__VERBOSE et.al. to simplify defining -f/--force options. Signed-off-by: Rene Scharfe <rene.scharfe@lstfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/branch.c')
-rw-r--r--builtin/branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 10788fc..e388edc 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -651,7 +651,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', "force", &force_create, "force creation (when already exists)"),
+ OPT__FORCE(&force_create, "force creation (when already exists)"),
{
OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,
"commit", "print only not merged branches",