Merge branch 'sb/show-branch-parse-options'
commitc6e73936b9ea26fcad0d77d68194545082343c43
authorJunio C Hamano <gitster@pobox.com>
Sun, 31 May 2009 23:17:58 +0000 (31 16:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 May 2009 23:17:58 +0000 (31 16:17 -0700)
tree6cc2136936d1c2422205ff63ae4d3da32396ae79
parent919cc4d0688cea6b7c0ed8c515f5907fcd85002c
parent57343652a55bdc3e7f3cf8c6def94dac482c72e5
Merge branch 'sb/show-branch-parse-options'

* 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