From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 31 May 2009 23:17:31 +0000 (-0700)
Subject: Merge branch 'sb/format-patch-parseopt'
X-Git-Tag: v1.6.4-rc0~98
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1af4731b5435e708355f20463a458493aa0e5aca?hp=1af4731b5435e708355f20463a458493aa0e5aca

Merge branch 'sb/format-patch-parseopt'

* sb/format-patch-parseopt:
format-patch: migrate to parse-options API

Conflicts:
builtin-log.c
---