Skip to content

Instantly share code, notes, and snippets.

@richardbporter
Last active May 18, 2022 20:44
Show Gist options
  • Save richardbporter/3e51fd76c0bd7e734c2158f0f9add3af to your computer and use it in GitHub Desktop.
Save richardbporter/3e51fd76c0bd7e734c2158f0f9add3af to your computer and use it in GitHub Desktop.
git config
[user]
name = me
email = me@me.com
[color]
ui = auto
[core]
fileMode = false
editor = code --wait
excludesfile = ~/.gitignore
[push]
default = current
[rerere]
enabled = true
autoupdate = true
[difftool]
prompt = false
[diff]
tool = pstorm
[difftool "pstorm"]
cmd = pstorm diff $LOCAL $REMOTE
[merge]
tool = pstorm
[mergetool "pstorm"]
cmd = pstorm merge $LOCAL $REMOTE $BASE $MERGED
[mergetool]
keepBackup = false
[pull]
rebase = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment