diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2010-11-08 19:01:54 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-15 10:04:43 -0800 |
| commit | 76946b76fe3d26507d61cae97aa0676fad24ed92 (patch) | |
| tree | cb637a3012a3b7f5f448ff660106ba1e2595da09 /builtin/checkout.c | |
| parent | d52ee6e6131f65bb4360743ebea2e7b400b544e4 (diff) | |
| download | git-76946b76fe3d26507d61cae97aa0676fad24ed92.tar.gz | |
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/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 a952477d19..f275570cbd 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -699,7 +699,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) 2), OPT_SET_INT('3', "theirs", &opts.writeout_stage, "checkout their version for unmerged files", 3), - OPT_BOOLEAN('f', "force", &opts.force, "force checkout (throw away local modifications)"), + OPT__FORCE(&opts.force, "force checkout (throw away local modifications)"), OPT_BOOLEAN('m', "merge", &opts.merge, "perform a 3-way merge with the new branch"), OPT_STRING(0, "conflict", &conflict_style, "style", "conflict style (merge or diff3)"), |