GitTips

GitTips.md

Nice Hacks

• Using git bisect for finding the "broken commit": https://stackoverflow.com/a/4714297/1948946
• Using git pickaxe for searching commits that added a certain string: https://gist.github.com/phil-blain/2a1cf81a0030001d33158e44a35ceda6

Migrate from Bitbucket to GitHub

1. Make sure your SSH public key is here: https://github.com/settings/keys (you will find a .pub file in ~/.ssh in your machine)
2. Make sure you have custom routing for your new organization email (https://github.com/settings/notifications)
3. Run git config --global user.email and git config --global user.name to make sure your name and email are correct
4. Use the GitHub Import tool (temporarily remove 2-factor auth from BitBucket account) as this will migrate all the branches/tags, etc.
5. Use these commands to point your local repo to the new remote:

git remote rename origin bitbucket
git remote add origin git@github.com:feebris/XXXX.git
git fetch origin
git branch master --set-upstream-to origin/master
git branch -vv --> to check all the branches are pointing to the correct origin

Git Clients

• DO NOT use Sourcetree because of this: https://community.atlassian.com/t5/Sourcetree-questions/SourceTree-3-1-2-100-CPU-usage-on-Mac/qaq-p/1074178
• Tower: https://www.git-tower.com/mac (£50 per year)
• Github Desktop:
• Git Kraken: https://www.gitkraken.com/

Git Tips

• Turn off file tracking: git config --local core.fileMode false (see https://medium.com/@tahteche/how-git-treats-changes-in-file-permissions-f71874ca239d)