diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2015-03-11 16:32:45 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:13:46 -0700 |
| commit | da0005b8853137c91e44867d899910d5c7eb4425 (patch) | |
| tree | 1af52f958322db86cb9916d162d9a29df726b1f2 /Documentation/merge-config.txt | |
| parent | 7a9409cb0104466eba32162f5bc4e5ab46130f02 (diff) | |
| download | git-da0005b8853137c91e44867d899910d5c7eb4425.tar.gz git-da0005b8853137c91e44867d899910d5c7eb4425.tar.xz | |
*config.txt: stick to camelCase naming convention
This should improve readability. Compare "thislongname" and
"thisLongName". The following keys are left in unchanged. We can
decide what to do with them later.
- am.keepcr
- core.autocrlf .safecrlf .trustctime
- diff.dirstat .noprefix
- gitcvs.usecrlfattr
- gui.blamehistoryctx .trustmtime
- pull.twohead
- receive.autogc
- sendemail.signedoffbycc .smtpsslcertpath .suppresscc
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index d78d6d854..8a0e52f8e 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -1,4 +1,4 @@ -merge.conflictstyle:: +merge.conflictStyle:: Specify the style in which conflicted hunks are written out to working tree files upon merge. The default is "merge", which shows a `<<<<<<<` conflict marker, changes made by one side, |