From: Junio C Hamano <junkio@cox.net>
Date: Sat, 15 Apr 2006 10:24:54 +0000 (-0700)
Subject: Merge branch 'jc/logopt' into next
X-Git-Tag: v1.4.1-rc1~220
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0d53adf15b09ee60d29a1b4d8e981b9eb5de8e91;p=git-core%2Fgit.git

Merge branch 'jc/logopt' into next

* jc/logopt:
  Extract "log [diff options]" parser out.
  diff-tree: typefix.
---

0d53adf15b09ee60d29a1b4d8e981b9eb5de8e91