Git

Config#

Sensible git options to set.

git config --global push.autosetupremote true
git config --global core.excludeFiles ~/.gitignore
git config --global blame.ignoreRevsFile .git-blame-ignore-revs
git config --global pull.rebase false
git config --global push.useForceIfIncludes true

.idea
.DS_Store
node_modules

See more cool git options explained here.

Usage#

Update branch#

Update my branch with the latest changes from main.

git fetch
git merge origin/main

`git switch`#

git switch is the new limited version of git checkout see this StackOverflow thread for more details.

Create a branch.#

git switch -c $BRANCH_NAME

Go back to previous branch.#

git switch -

Force push#

Force push only if your changes are the latest changes on the remote. This prevents you from overwriting someone else’s changes. See more details.

git push --force-with-lease

Pull#

git pull --rebase

Abort if there are conflicts

git rebase --abort

Pull with merge to resolve conflict

git pull --no-rebase # or use `git pull` with `git config --global pull.rebase false`

Ignore specific commits in git blame#

Sometimes, you will commit large formatting changes which makes git blame fairly useless because almost every line will have the formatting change as its most recent commit.

With git config blame.ignoreRevsFile .git-blame-ignore-revs, you can create a .git-blame-ignore-revs file containing commit SHAs that should be ignored by git blame in VSCode and GitHub. GitHub supports .git-blame-ignore-revs files natively without configuration.

[blame]
    ignoreRevsFile = .git-blame-ignore-revs

Example of a .git-blame-ignore-revs file.

# Enforced single quotes over double quotes
7e9386274b3b969b70ae4beda1b3321812c1c512

Using git pull —rebase

Git