diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:05 -0800 |
| commit | c11c154f429f23f1c30f2aa067ff8bf6c1b982fe (patch) | |
| tree | a602dec0fd795d93525b61c79c77f3152efc0972 /merge-recursive.c | |
| parent | Merge branch 'av/wincred-with-at-in-username-fix' into maint (diff) | |
| parent | CodingGuidelines: describe naming rules for configuration variables (diff) | |
| download | tgif-c11c154f429f23f1c30f2aa067ff8bf6c1b982fe.tar.xz | |
Merge branch 'jc/conf-var-doc' into maint
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
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions