mirror of
https://github.com/StevenBlack/hosts.git
synced 2024-07-07 13:02:27 +02:00
parent
ac33a449af
commit
56392a2220
14
readme.md
14
readme.md
@ -168,6 +168,20 @@ final hosts file.
|
|||||||
The `whitelist` is not tracked by git, so any changes you make won't be
|
The `whitelist` is not tracked by git, so any changes you make won't be
|
||||||
overridden when you `git pull` this repo from `origin` in the future.
|
overridden when you `git pull` this repo from `origin` in the future.
|
||||||
|
|
||||||
|
### How do I pull this repo without losing changes?
|
||||||
|
|
||||||
|
The easiest way to update this repo without overriding the `whitelist`,
|
||||||
|
`blacklist`, or `myhosts` files is to run the following commands. Any changes
|
||||||
|
to these files will be placed into a stash so that you can pop after the
|
||||||
|
updated repo is pulled.
|
||||||
|
```bash
|
||||||
|
git checkout -- hosts readmeData.json
|
||||||
|
git stash
|
||||||
|
git pull
|
||||||
|
git stash pop
|
||||||
|
```
|
||||||
|
After this the `updateHostsFile.py` script can be run to update the hosts
|
||||||
|
file.
|
||||||
|
|
||||||
## What is a hosts file?
|
## What is a hosts file?
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user