From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 31 May 2009 23:57:42 +0000 (-0700)
Subject: Merge branch 'sb/opt-filename'
X-Git-Tag: v1.6.4-rc0~94
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f9275c68af58e0f65e1557b5109ccbfdbbbc384a;p=git.git

Merge branch 'sb/opt-filename'

* sb/opt-filename:
  parse-opts: add OPT_FILENAME and transition builtins
  parse-opts: prepare for OPT_FILENAME

Conflicts:
	builtin-log.c
---

f9275c68af58e0f65e1557b5109ccbfdbbbc384a