![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 12 Oct 2011 19:34:15 +0000 (12:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 12 Oct 2011 19:34:15 +0000 (12:34 -0700) | ||
| commit | af543833d4e10163af8045859cc081969fa5fcec | |
| tree | 8d131837c007202fa2e733996c8b5384fe73bde5 | tree | snapshot |
| parent | fbca6911dedd58136d27bff452c3ccdf48c82779 | commit | diff |
| parent | af1032edf951b4f0f0b3811af4e34e26198a9ef8 | commit | diff |
Merge branch 'jc/parse-options-boolean'
* jc/parse-options-boolean:
apply: use OPT_NOOP_NOARG
revert: use OPT_NOOP_NOARG
parseopt: add OPT_NOOP_NOARG
archive.c: use OPT_BOOL()
parse-options: deprecate OPT_BOOLEAN
Conflicts:
builtin/revert.c
* jc/parse-options-boolean:
apply: use OPT_NOOP_NOARG
revert: use OPT_NOOP_NOARG
parseopt: add OPT_NOOP_NOARG
archive.c: use OPT_BOOL()
parse-options: deprecate OPT_BOOLEAN
Conflicts:
builtin/revert.c
| builtin/revert.c | diff1 | | diff2 | | blob | history |