![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Nov 2010 00:00:35 +0000 (16:00 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Nov 2010 00:00:35 +0000 (16:00 -0800) | ||
| commit | 77190a57ed4159512a12b159dbf4e7d177e78121 | |
| tree | 4faa1e0747ce5e0dea12beb2d2e6f051b39a94c6 | tree | snapshot |
| parent | f46d2ce9ad3e77001c9f674369ee8b374023fa94 | commit | diff |
| parent | 49bd56a5f7b09f89b59a6a77d331e8f85f6d7fde | commit | diff |
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
* 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