Skip to content

Instantly share code, notes, and snippets.

@matthewsimo
Last active December 22, 2015 09:18
Show Gist options
  • Save matthewsimo/6450694 to your computer and use it in GitHub Desktop.
Save matthewsimo/6450694 to your computer and use it in GitHub Desktop.
Here's my .gitconfig, be sure and replace with your github token.
[user]
name = Matthew Simo
email = [email protected]
[core]
excludesfile = /Users/matthewsimo/.gitignore_global
editor = vim
ui = true
[alias]
st = status
ci = commit
co = checkout
br = branch
sm = submodule
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
[color]
branch = auto
diff = auto
interactive = auto
status = auto
[github]
user = matthewsimo
token = token-here
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false
[merge]
tool = Kaleidoscope
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment