Merge branch 'iu/fix-parse-options-h-comment'
commit1d058dc6e5bdc6832906aa3237157787cbccda8a
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Apr 2015 17:33:45 +0000 (14 10:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Apr 2015 17:33:46 +0000 (14 10:33 -0700)
treed21c004fa954067d3ef7a5f1d80d49b90480db42
parent638cbf5f0f0dba7df1ad487e45638342c9afb6a0
parentd3c0811467153d3bf1732fef94530e5b0e7cdddf
Merge branch 'iu/fix-parse-options-h-comment'

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