Merge branch 'cn/log-parse-opt'
commit2f3e3f573d635c26ce26ff61f8f6c97ce88da79c
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:59:57 +0000 (13 10:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:59:57 +0000 (13 10:59 -0700)
tree3c8d6acca28f1434498dcc3289be2a96d403970a
parent32341b9df528e4fce87f53dee7bf8487009d01c3
parent1c40c36b9acbb55726ea0fcf98714a85e159e45f
Merge branch 'cn/log-parse-opt'

* cn/log-parse-opt:
  log: convert to parse-options
builtin/log.c