Merge branch 'jk/diff-m-doc'
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:22:27 +0000 (11:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:22:27 +0000 (11:22 -0700)
* jk/diff-m-doc:
  docs: clarify meaning of -M for git-log

1  2 
Documentation/diff-options.txt

Simple merge