Merge branch 'sn/diff-doc' into next
commit77190a57ed4159512a12b159dbf4e7d177e78121
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Nov 2010 00:00:35 +0000 (24 16:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Nov 2010 00:00:35 +0000 (24 16:00 -0800)
tree4faa1e0747ce5e0dea12beb2d2e6f051b39a94c6
parentf46d2ce9ad3e77001c9f674369ee8b374023fa94
parent49bd56a5f7b09f89b59a6a77d331e8f85f6d7fde
Merge branch 'sn/diff-doc' into next

* sn/diff-doc:
  docs: clarify git diff modes of operation
  diff,difftool: Don't use the {0,2} notation in usage strings
  CodingGuidelines: Add a section on writing documentation