Merge branch 'jk/diff-m-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:40:57 +0000 (05:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:40:57 +0000 (05:40 -0700)
commit7a0d54facd476a9197f405d2cc65d4bc73e3f1a6
treeebd6668f5febd5351059a778b6544539a4177162
parentb17847884ff7c122621123d4a3e0e65f046b07a8
parent7ffad2501489690edd9335fdd1e69c05699767e3
Merge branch 'jk/diff-m-doc' into maint

* jk/diff-m-doc:
  docs: clarify meaning of -M for git-log