Merge branch 'jc/logopt' into next
authorJunio C Hamano <junkio@cox.net>
Sat, 15 Apr 2006 10:24:54 +0000 (03:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 15 Apr 2006 10:24:54 +0000 (03:24 -0700)
commit0d53adf15b09ee60d29a1b4d8e981b9eb5de8e91
treef82c05cb524274973e3518c9f7706fd2e42f805b
parentfb8e008219421de11ba9e34258e5c09da652d845
parentf4235f8b2ef875b85ead74ffa199d827f9ee9d8d
Merge branch 'jc/logopt' into next

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