Merge branch 'jk/diff-m-doc'
commitb0fd34ecd5a386b7b09a0161413c50f957ac181e
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:22:27 +0000 (13 11:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:22:27 +0000 (13 11:22 -0700)
tree77b7aa3fc94f1d95fc0a32bd52fa12ada135b1d8
parentc7f874e405a52f93d486094034d886fc140961c9
parent7ffad2501489690edd9335fdd1e69c05699767e3
Merge branch 'jk/diff-m-doc'

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