Merge branch 'rs/no-no-no-parseopt'
commit66b8800e53b20cda13446b462531641884089a77
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Mar 2012 04:59:31 +0000 (1 20:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Mar 2012 04:59:31 +0000 (1 20:59 -0800)
tree53ef62b1b878ee340809499296fdad4a898f3db3
parent260eb7e38966bdad79aae2e125c9a07b19abd0f8
parentcbb08c2e0b41ab162838aa1e83b959bac91151e2
Merge branch 'rs/no-no-no-parseopt'

* rs/no-no-no-parseopt:
  parse-options: remove PARSE_OPT_NEGHELP
  parse-options: allow positivation of options starting, with no-
  test-parse-options: convert to OPT_BOOL()

Conflicts:
builtin/grep.c
Documentation/RelNotes/1.7.10.txt
builtin/fast-export.c
builtin/grep.c