Merge branch 'nk/config-local-doc' into maint

* nk/config-local-doc: config: Add description of --local option

Junio C Hamano committed Jul 21, 2013 at 22:51 UTC b6538a0b4eee113d207961bacc1abb6ac5b2e661

No changes.