2 Commits

Author	SHA1	Message	Date
Oleg Semyonov	e2bcac4e21	.gitattributes: add a note how to renormalize old branches for merge	2013-04-24 03:31:09 +03:00
Oleg Semyonov	3bebec22f7	OP-772: Enforce line ending agreements (git 1.7.2+ required for this to work) ... This is a part of OP-726, OP-727 tasks to normalize source code. Use the following to normalise your local repository to be able to merge: git rm --cached -r . git diff --cached --name-only -z | xargs -0 git add git commit -m "Normalise line endings" git ls-files -z | xargs -0 rm git checkout .	2013-04-05 23:43:58 +03:00