Code

Merge branch 'jc/git-log-doc'
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Dec 2007 07:43:54 +0000 (23:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Dec 2007 07:43:54 +0000 (23:43 -0800)
* jc/git-log-doc:
  Include diff options in the git-log manpage


Trivial merge