Merge branch 'cr/reset-parseopt'
commitb59fd2098e6606e1a696fc1cafe897e074ed6d6f
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 Mar 2008 04:09:55 +0000 (8 20:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Mar 2008 04:09:55 +0000 (8 20:09 -0800)
tree2d26d28bb52056c2c52417a2a1d36a42781bcf04
parent11a1d351cfd63cb110e725ba7aae247215b47b56
parent5eee6b28b5fc6be03a89dfa6b6ca502ec49dc2df
Merge branch 'cr/reset-parseopt'

* cr/reset-parseopt:
  Make builtin-reset.c use parse_options.