Merge branch 'jc/parse-options-boolean'
commitaf543833d4e10163af8045859cc081969fa5fcec
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Oct 2011 19:34:15 +0000 (12 12:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Oct 2011 19:34:15 +0000 (12 12:34 -0700)
tree8d131837c007202fa2e733996c8b5384fe73bde5
parentfbca6911dedd58136d27bff452c3ccdf48c82779
parentaf1032edf951b4f0f0b3811af4e34e26198a9ef8
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
builtin/revert.c