Skip to content

Commit bf9853c

Browse files
authored
Update README.md
1 parent 753e870 commit bf9853c

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

README.md

+17-10
Original file line numberDiff line numberDiff line change
@@ -191,22 +191,29 @@ You won't have to open a bunch of terminals to keep it running!
191191

192192
Rinse and repeat for all your databases.
193193

194-
## DNS Server
194+
## git & GitHub
195195

196-
Set Google as your computer's DNS server and default search domain,
197-
which will almost always be better than your ISP's default settings.
198-
https://developers.google.com/speed/public-dns/docs/using?hl=en#mac_os
196+
You may want to set up a few configs.
199197

200-
Alternatively, set this in your router.
198+
Always fast-forward when pulling (never rebase as it may mess up your local branch):
199+
200+
```zsh
201+
git config --global pull.ff only
202+
```
203+
204+
- [Setup SSH for GitHub](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent)
205+
- [GitHub Desktop](https://desktop.github.com/)
206+
- [GitHub CLI](https://cli.github.com)
201207

202208
## Tools & Applications
203209

204210
- [iStat Menus](http://bjango.com/mac/istatmenus/) - help me figure out if something's taking too much CPU, RAM, or network
205211
- [VS Code](https://code.visualstudio.com/)
206-
- [GitHub Desktop](https://desktop.github.com/)
207212
- [Docker for Mac](https://docs.docker.com/docker-for-mac/install/)
208213
- [EditorConfig](https://editorconfig.org/)
209-
210-
## Etc.
211-
212-
- [SF Fonts](https://developer.apple.com/fonts/)
214+
- [Set up private npm token](https://docs.npmjs.com/using-private-packages-in-a-ci-cd-workflow)
215+
- [Set up ssh without typing your password](https://superuser.com/questions/8077/how-do-i-set-up-ssh-so-i-dont-have-to-type-my-password)
216+
- [Bittorrent blocklist](https://gist.github.com/shmup/29566c5268569069c256)
217+
- [Hosts file blocklist](https://github.com/StevenBlack/hosts)
218+
- [Google DNS](https://developers.google.com/speed/public-dns)
219+
- [Cloudflare DNS](https://1.1.1.1/dns/)

0 commit comments

Comments
 (0)