Merge branch 'jc/git-log-doc'
commitc1f238698b9c2ceda7feede573e350c01054ac45
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Dec 2007 07:43:54 +0000 (6 23:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Dec 2007 07:43:54 +0000 (6 23:43 -0800)
tree9372ee3c0c2275933df76b366ea95ee20cd6a5d9
parentca7325621a1792463fdd3bd40a4e5dc766115ad7
parent272bd3cfd059cf867b979d5c11b0ccce9bcccbb3
Merge branch 'jc/git-log-doc'

* jc/git-log-doc:
  Include diff options in the git-log manpage