Skip to content

Instantly share code, notes, and snippets.

@devpilot
Last active September 1, 2022 07:01
Show Gist options
  • Save devpilot/5279153 to your computer and use it in GitHub Desktop.
Save devpilot/5279153 to your computer and use it in GitHub Desktop.
my git config file
[user]
name = ""
email = ""
[alias]
co = checkout
br = branch
ca = commit -am
st = status
lg = log --oneline --all --graph --decorate
al = "!gitk --all&"
dt = difftool
mt = mergetool
unstage = reset HEAD
sync = !git pull --rebase && git push
[diff]
tool = vscode
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[merge]
tool = kdiff3
[mergetool "kdiff3"]
cmd = kdiff3 -m -b $BASE $LOCAL $REMOTE -o $MERGED
keepBackup = false
[mergetool "vscode"]
cmd = code --wait $MERGED
[pull]
rebase = false
[init]
defaultBranch = main
[fetch]
prune = true
[mergetool]
keepBackup = false
[rerere]
enabled = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment