tree d46d48f1f8b72f2a7d11683d574acf763caad29b
parent 744ea70c7acaa74249ede91d71de9535c1db1431
parent 35840a3e789dd67528caefc146deb698bd6ac7a5
author Junio C Hamano <gitster@pobox.com> 1424636911 -0800
committer Junio C Hamano <gitster@pobox.com> 1424636911 -0800

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