An error occurred while loading the file. Please try again.
-
Joerg Bornemann authored
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>
5958b8d3
The Qt Company Qt LGPL Exception version 1.1As an additional permission to the GNU Lesser General Public License version2.1, the object code form of a "work that uses the Library" may incorporatematerial from a header file that is part of the Library. You may distributesuch object code under terms of your choice, provided that: (i) the header files of the Library have not been modified; and (ii) the incorporated material is limited to numerical parameters, data structure layouts, accessors, macros, inline functions and templates; and (iii) you comply with the terms of Section 6 of the GNU Lesser General Public License version 2.1.Moreover, you may apply this exception to a modified version of the Library,provided that such modification does not involve copying material from theLibrary into the modified Library's header files unless such material islimited to (i) numerical parameters; (ii) data structure layouts;(iii) accessors; and (iv) small macros, templates and inline functions offive lines or less in length.Furthermore, you are not required to apply this additional permission to amodified version of the Library.