- Dash (https://kapeli.com/dash) for browsing documentation locally (often faster than searching the web when you know what you are looking for), alternative: https://devdocs.io (works in browser), Zeal (https://zealdocs.org, for Windows & Linux)

- Sublime Merge for solving merge conflicts and committing individual lines (I'm for command line when working with Git, but `git add -p` is often frustrating, with Sublime Merge it's very easy once you got used to the tool)