Merge branch 'jc/conf-var-doc'
commit9a9c1f1fdfb4e8bb253bfa27311e8a8ad82c8859
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Feb 2015 20:28:31 +0000 (22 12:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Feb 2015 20:28:31 +0000 (22 12:28 -0800)
treed46d48f1f8b72f2a7d11683d574acf763caad29b
parent744ea70c7acaa74249ede91d71de9535c1db1431
parent35840a3e789dd67528caefc146deb698bd6ac7a5
Merge branch 'jc/conf-var-doc'

Longstanding configuration variable naming rules has been added to
the documentation.

* jc/conf-var-doc:
  CodingGuidelines: describe naming rules for configuration variables
  config.txt: mark deprecated variables more prominently
  config.txt: clarify that add.ignore-errors is deprecated
Documentation/CodingGuidelines
Documentation/config.txt