Skip to content

Instantly share code, notes, and snippets.

@gburgett
Created December 14, 2017 17:09
Show Gist options
  • Save gburgett/72825ecde8f7f24b25996382863ce401 to your computer and use it in GitHub Desktop.
Save gburgett/72825ecde8f7f24b25996382863ce401 to your computer and use it in GitHub Desktop.
gitconfig
[user]
name = Gordon
email = gburgett@****
signingkey = ******
[core]
excludesfile = /Users/gburgett/.gitignore_global
editor = /usr/bin/vim
[difftool "sourcetree"]
cmd = /usr/local/bin/bcomp \"$LOCAL\" \"$REMOTE\"
path = -ro
[mergetool "sourcetree"]
cmd = /usr/local/bin/bcomp \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
[alias]
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s\n%Cgreen(%cr) %C(bold blue)<%an>%Creset %C(cyan)%GS%C(reset)' --abbrev-commit
review = !git fetch origin master && git difftool --dir-diff $(git merge-base HEAD origin/master)
changed = diff --name-only
skip = update-index --assume-unchanged
unskip = update-index --no-assume-unchanged
dmerged = !git branch --merged master | egrep -v '^\\s*\\*?\\s*master$' | xargs git branch -d
track = "!git checkout -b \"$1\" \"origin/$1\" #"
[diff]
tool = bcomp
[difftool]
prompt = false
[difftool "bcomp"]
trustExitCode = true
cmd = "/usr/local/bin/bcomp" \"$LOCAL\" \"$REMOTE\"
[merge]
tool = bcomp
ff = only
[mergetool]
prompt = false
[mergetool "bcomp"]
trustExitCode = true
cmd = "/usr/local/bin/bcomp" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
[commit]
gpgsign = true
template = /Users/gburgett/.stCommitMsg
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment