Code

Merge branch 'jk/diff-driver-binary-doc' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:37:26 +0000 (10:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2011 18:37:26 +0000 (10:37 -0800)
commit1aa4c707f5e9217cffcce5f367ffea126caf0d51
treeb4d7aac75bce19d9cc79025926dddbdc45f6f27c
parentbd2f6196b035e52a7cd893665dd189b496a8e5b5
parentab4356111afb28568bf1ad2e909b6ecf9f83a5e6
Merge branch 'jk/diff-driver-binary-doc' into next

* jk/diff-driver-binary-doc:
  docs: explain diff.*.binary option
Documentation/gitattributes.txt