From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Nov 2010 00:00:35 +0000 (-0800)
Subject: Merge branch 'sn/diff-doc' into next
X-Git-Tag: ko-next~112
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=77190a57ed4159512a12b159dbf4e7d177e78121;p=git.git

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
---

77190a57ed4159512a12b159dbf4e7d177e78121