From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 4 Dec 2010 00:10:36 +0000 (-0800)
Subject: Merge branch 'sn/diff-doc'
X-Git-Tag: v1.7.4-rc0~91
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=45a7b55d6fe69581d12b83f63337eaa1015b6717;p=git.git

Merge branch 'sn/diff-doc'

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

45a7b55d6fe69581d12b83f63337eaa1015b6717