Andrew's git / gitweb.git / diff
?
Merge branch 'sb/show-branch-parse-options' into sb/opt-filename
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 May 2009 07:59:29 +0000 (00:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 May 2009 07:59:29 +0000 (00:59 -0700)
* sb/show-branch-parse-options:
show-branch: migrate to parse-options API
parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's

Conflicts:
parse-options.h

No differences found