Merge branch 'sb/format-patch-parseopt' into sb/opt-filename
commit8a17595899ac49a24128db76a80fbb35da487845
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 May 2009 07:59:59 +0000 (25 00:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 May 2009 07:59:59 +0000 (25 00:59 -0700)
tree0f63c48a50c0a3174bac68d151cb09e39283089a
parentb064e2fc3d197c3c691fe89c43d1bf79f64fcdf7
parentfff02ee666021b67b2272ce4445f7c1f5b26b77c
Merge branch 'sb/format-patch-parseopt' into sb/opt-filename

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

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