diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2016-08-26 21:57:17 +0300 |
|---|---|---|
| committer | Fred Sundvik <fsundvik@gmail.com> | 2016-08-26 21:57:17 +0300 |
| commit | d1e4f2eb0838ef400f4f76fc644610d6c8230658 (patch) | |
| tree | 4ab736ca54ca365910e566c848b30bbffbb6e68e /readme.md | |
| parent | 6cfdd077b5bcdcfe8b390e4c07965eaf6c081c76 (diff) | |
| parent | 2c8f6557e6994d3fe4fa2038f6cb4a4e51caf3a9 (diff) | |
| download | qmk_firmware-d1e4f2eb0838ef400f4f76fc644610d6c8230658.tar.gz qmk_firmware-d1e4f2eb0838ef400f4f76fc644610d6c8230658.zip | |
Merge remote-tracking branch 'upstream/master' into makefile_overhaul
Diffstat (limited to 'readme.md')
| -rw-r--r-- | readme.md | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -54,10 +54,10 @@ Here are the steps | |||
| 54 | 1. Install the Windows 10 subsystem for Linux, following [these instructions](http://www.howtogeek.com/249966/how-to-install-and-use-the-linux-bash-shell-on-windows-10/). | 54 | 1. Install the Windows 10 subsystem for Linux, following [these instructions](http://www.howtogeek.com/249966/how-to-install-and-use-the-linux-bash-shell-on-windows-10/). |
| 55 | 2. If you have previously cloned the repository using the normal Git bash, you will need to clean up the line endings. If you have cloned it after 20th of August 2016, you are likely fine. To clean up the line endings do the following | 55 | 2. If you have previously cloned the repository using the normal Git bash, you will need to clean up the line endings. If you have cloned it after 20th of August 2016, you are likely fine. To clean up the line endings do the following |
| 56 | 1. Make sure that you have no changes you haven't committed by running `git status`, if you do commit them first | 56 | 1. Make sure that you have no changes you haven't committed by running `git status`, if you do commit them first |
| 57 | 2. From within the Git bash run ´git rm --cached -r .` | 57 | 2. From within the Git bash run `git rm --cached -r .` |
| 58 | 3. Followed by `git reset --hard` | 58 | 3. Followed by `git reset --hard` |
| 59 | 3. Start the "Bash On Ubuntu On Windows" from the start menu | 59 | 3. Start the "Bash On Ubuntu On Windows" from the start menu |
| 60 | 4. With the bash open, navigate to your git checkout. The harddisk can be accessed from `/mnt` for example `/mnt/c` for the `c:\` drive. | 60 | 4. With the bash open, navigate to your Git checkout. The harddisk can be accessed from `/mnt` for example `/mnt/c` for the `c:\` drive. |
| 61 | 5. Run `sudo util/install_dependencies.sh`. | 61 | 5. Run `sudo util/install_dependencies.sh`. |
| 62 | 6. After a while the installation will finish, and you are good to go | 62 | 6. After a while the installation will finish, and you are good to go |
| 63 | 63 | ||