Merge branch 'iu/fix-parse-options-h-comment' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Apr 2015 19:12:20 +0000 (12:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Apr 2015 19:12:20 +0000 (12:12 -0700)
commitc84364abe3f7da3fdef67cc0f8762eabe2a71710
tree8ea8da36bda8e9cf5c73079fd756476de10f19d0
parente8281f01642fe17d6f44b3b18ed333b322770e81
parentd3c0811467153d3bf1732fef94530e5b0e7cdddf
Merge branch 'iu/fix-parse-options-h-comment' into maint

* iu/fix-parse-options-h-comment:
  parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval
parse-options.h