From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Jun 2008 01:39:37 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.0-rc0~227
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0bd64f82ba38013799d1d999de5fc3c079bd8014;p=git.git

Merge branch 'maint'

* maint:
  Extend parse-options test suite
  api-parse-options.txt: Introduce documentation for parse options API
  parse-options.c: fix documentation syntax of optional arguments
  api-builtin.txt: update and fix typo
---

0bd64f82ba38013799d1d999de5fc3c079bd8014