From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 May 2009 07:59:29 +0000 (-0700)
Subject: Merge branch 'sb/show-branch-parse-options' into sb/opt-filename
X-Git-Tag: v1.6.4-rc0~94^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b064e2fc3d197c3c691fe89c43d1bf79f64fcdf7?hp=b064e2fc3d197c3c691fe89c43d1bf79f64fcdf7

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
---