4b94ae76f75907602a9b0968d8cb3e704e6a7505
wiki/howto/onboarding.md
| ... | ... | @@ -120,7 +120,7 @@ When doing a diff, you can also use the parameters `--ignore-space-at-eol` and ` |
| 120 | 120 | |
| 121 | 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 | 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". |
|
| 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 checkout HEAD path/toFile/in/repository". |
|
| 124 | 124 | |
| 125 | 125 | #### Additional steps required for Android projects |
| 126 | 126 |