diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-07-20 13:47:19 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-07-21 05:44:28 +0000 |
| commit | 5958b8d3f0bded6c3839f7919d181bca68e222ad (patch) | |
| tree | f5feb359ae130edc06e38ec876e0c8fba5b01810 | |
| parent | c9d5341307e02cc71d4d99342e6915621f7d18f3 (diff) | |
Turn off line ending conversion for .commit-template
When committing a change, the automatically generated git commit message
consists of
1) The content of .commit-template
2) Informative text for the current commit, generated by git.
While 2) always has LF line endings, even on Windows, 1) might have CRLF
line endings if core.autocrlf=true. The result is a text with mixed line
endings. With the default editor vim, every line of the commit template
part ends with ^M.
Fix this by forcing the line endings of .commit-template to be LF
regardless of core.autocrlf.
Change-Id: I6db825695466d7f48f1fa4f771d83fb872fdb576
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 084cdfd6..11a643c0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ .tag export-subst .gitignore export-ignore .gitattributes export-ignore -.commit-template export-ignore +.commit-template export-ignore eol=lf init-repository export-ignore README.git export-ignore |