Updated onboarding regarding git and line endings

Steffen Schaefer commited 2017-05-02 15:40:45 +0200 commit 8cd3d092f1f507423f64abc62e6e2c8e0cbd430e

				wiki/howto/onboarding.md
			
          @@ -118,7 +118,9 @@ In cases where code was reformatted, you can also ignore all whitespace changes 

           When doing a diff, you can also use the parameters `--ignore-space-at-eol` and `--ignore-space-change`.

          -When doing a merge in Eclipse, you can tell the merge editor to do a similar thing by right clicking and selecting "Ignore White Space". Other merge/diff tools also provide such a functionality. 

          +When doing a merge in Eclipse, you can tell the merge editor to do a similar thing by right clicking and selecting "Ignore White Space". Other merge/diff tools also provide such a functionality.

          +

          +When a file has "wrong line endings" (line endings are different to what is configured in ".gitattributes" file) and you touch those files without changing the contents, git will potentially show that these files are changed. To get rid of those phantom changes, you can do a "git reset --hard -- path/toFile/in/repository".

           #### Additional steps required for Android projects

...	...	@@ -118,7 +118,9 @@ In cases where code was reformatted, you can also ignore all whitespace changes
118	118
119	119	When doing a diff, you can also use the parameters `--ignore-space-at-eol` and `--ignore-space-change`.
120	120
121		-When doing a merge in Eclipse, you can tell the merge editor to do a similar thing by right clicking and selecting "Ignore White Space". Other merge/diff tools also provide such a functionality.
	121	+When doing a merge in Eclipse, you can tell the merge editor to do a similar thing by right clicking and selecting "Ignore White Space". Other merge/diff tools also provide such a functionality.
	122	+
	123	+When a file has "wrong line endings" (line endings are different to what is configured in ".gitattributes" file) and you touch those files without changing the contents, git will potentially show that these files are changed. To get rid of those phantom changes, you can do a "git reset --hard -- path/toFile/in/repository".
122	124
123	125	#### Additional steps required for Android projects
124	126