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)
commitb064e2fc3d197c3c691fe89c43d1bf79f64fcdf7
treecbb39054fa81329ff874cb71679221af448583dc
parentee969693c5e77e1b5ebda45bead569806d31b379
parent57343652a55bdc3e7f3cf8c6def94dac482c72e5
Merge branch 'sb/show-branch-parse-options' into sb/opt-filename

* 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
parse-options.c
parse-options.h