| commit | dd4936cc3f88cd4728c3838fdc9c9f67c2b8535d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 6 Oct 2011 22:41:57 +0000 (6 15:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 6 Oct 2011 22:41:57 +0000 (6 15:41 -0700) | ||
| tree | 81ce23d646ead1bcad7057855197f348252ec91a | treesnapshot (tar.gz zip) |
| parent | 76e90c33815724400f58e351f436050852a3af41 | commitdiff |
| parent | af1032edf951b4f0f0b3811af4e34e26198a9ef8 | commitdiff |
Merge branch 'jc/parse-options-boolean' into next
* 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/apply.c | diff1 | diff2 | blobhistory |
| builtin/revert.c | diff1 | diff2 | blobhistory |