Merge branch 'maint'
commitfc721b699b817e9cb78994c6dd6d86e744bd2112
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Aug 2008 05:46:22 +0000 (12 22:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Aug 2008 05:46:22 +0000 (12 22:46 -0700)
tree0025270b218499140b00d416e6ba804731023bc5
parentc67a9e26822b66a524424afd1197e47bed3ac565
parent9612e74342cfd38c0b83230a2c847cd070599a5a
Merge branch 'maint'

* maint:
  Do not talk about "diff" in rev-list documentation.
Documentation/rev-list-options.txt