Code

Merge branch 'sn/diff-doc'
authorJunio C Hamano <gitster@pobox.com>
Sat, 4 Dec 2010 00:10:36 +0000 (16:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 4 Dec 2010 00:10:36 +0000 (16:10 -0800)
commit45a7b55d6fe69581d12b83f63337eaa1015b6717
tree3d1911318c7fac20332867a64b3d13227524c636
parent2ab32a330c32d6b31928e50c9e06a0266e144e40
parent49bd56a5f7b09f89b59a6a77d331e8f85f6d7fde
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
Documentation/CodingGuidelines