diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:39:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:39:03 -0700 |
| commit | a86a8b9752d5abb7d0e6cd69017170e826d41fb5 (patch) | |
| tree | 82c43449ca57a50066eb342ab1610c0539eb58aa /builtin/reset.c | |
| parent | 366b80bf0a84b607115bd4ffcd8e5ebfc7338442 (diff) | |
| parent | 84d83f642a680f72f8e81313d605e61bf9efa38f (diff) | |
| download | git-a86a8b9752d5abb7d0e6cd69017170e826d41fb5.tar.gz | |
Merge branch 'sb/parseopt-boolean-removal'
Convert most uses of OPT_BOOLEAN/OPTION_BOOLEAN that can use
OPT_BOOL/OPTION_BOOLEAN which have much saner semantics, and turn
remaining ones into OPT_SET_INT, OPT_COUNTUP, etc. as necessary.
* sb/parseopt-boolean-removal:
revert: use the OPT_CMDMODE for parsing, reducing code
checkout-index: fix negations of even numbers of -n
config parsing options: allow one flag multiple times
hash-object: replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP
branch, commit, name-rev: ease up boolean conditions
checkout: remove superfluous local variable
log, format-patch: parsing uses OPT__QUIET
Replace deprecated OPT_BOOLEAN by OPT_BOOL
Remove deprecated OPTION_BOOLEAN for parsing arguments
Diffstat (limited to 'builtin/reset.c')
| -rw-r--r-- | builtin/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index afa6e020e8..090581564b 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -258,7 +258,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) N_("reset HEAD, index and working tree"), MERGE), OPT_SET_INT(0, "keep", &reset_type, N_("reset HEAD but keep local changes"), KEEP), - OPT_BOOLEAN('p', "patch", &patch_mode, N_("select hunks interactively")), + OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")), OPT_END() }; |