Coty, On Tue, Mar 5, 2019 at 6:23 AM Coty Sutherland <csuth...@apache.org> wrote:
> Hi, > > I updated the BUILDING and CONTRIBUTING documents so that GitHub users no > longer see instructions for SVN after our migration, however I had a few > questions. Does anyone know of a git equivalent to svn:eol-style that we > should be using? It is mentioned in the "git-svn quirks" section of > https://wiki.apache.org/general/GitAtApache, but before trying it I wanted > to get some feedback from everyone. > Do we use CRLF anywhere or do we always use LF everywhere and only adding the CRLF when archiving as .zip? If we do use CRLF anywhere, can there be a mixture of LF and CRLF in the same file? (I expect not) What about .bat files? I would expect those to always have CRLF, no? Git has a config file called .gitattributes [1] which allows to set the ending according to the file type (pattern), e.g. *.bat text eol=crlf Another option to consider is core.eol [2]. Thanks, Igal [1] https://git-scm.com/docs/gitattributes [2] https://git-scm.com/docs/git-config#git-config-coreeol > > Secondly, the SVN references in MERGE.txt should be cleaned up at this > point, right? Is the git section still up to date (I see it was updated > last on Jan 29, so probably)? > > > > Thanks! > Coty >
