Merge branch 'sb/format-patch-parseopt'
authorJunio C Hamano <gitster@pobox.com>
Sun, 31 May 2009 23:17:31 +0000 (16:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 May 2009 23:17:31 +0000 (16:17 -0700)
commit1af4731b5435e708355f20463a458493aa0e5aca
tree8adf5954924d5414196e2760871810cad3fa1b55
parent128b0c08cac16373b361726eebe72d5d5050b9c2
parentfff02ee666021b67b2272ce4445f7c1f5b26b77c
Merge branch 'sb/format-patch-parseopt'

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

Conflicts:
builtin-log.c
builtin-log.c