Skip to content

Instantly share code, notes, and snippets.

@philipcdavis

philipcdavis/.gitconfig

Last active November 28, 2021 06:25
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save philipcdavis/cc59bb397f43933f6122 to your computer and use it in GitHub Desktop.
Save philipcdavis/cc59bb397f43933f6122 to your computer and use it in GitHub Desktop.
Download ZIP
.gitconfig
Raw
.gitconfig
[init]
defaultBranch = main
[user]
name = Philip Davis
email = philipcdavis11@gmail.com
[diff]
tool = diffmerge
[difftool "diffmerge"]
cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[merge]
tool = diffmerge
[mergetool "diffmerge"]
cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
trustExitCode = true
[alias]
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit
logtree = log --all --graph --pretty=oneline
st = status -sb
fa = fetch --all --prune
review = "!f() { [[ $1 = '' ]] && REV=1 || REV=\"$1\"; git difftool HEAD~$REV; }; f"
la = !git lg --all
ba = branch -a
b = branch
co = checkout
[mergetool]
keepBackup = false
[core]
excludesfile = /Users/philipdavis/.gitignore_global
[push]
default = simple
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment