Skip to content

Instantly share code, notes, and snippets.

@henvic
Last active December 21, 2015 19:07
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 henvic/5cb63af18701f7d16f66 to your computer and use it in GitHub Desktop.
Save henvic/5cb63af18701f7d16f66 to your computer and use it in GitHub Desktop.
Git configs
[user]
name = Henrique Vicente
email = henriquevicente@gmail.com
[mergetool]
keepBackup = true
[core]
autocrlf = input
excludesfile = ~/.global_gitignore
editor = ~/Applications/Sublime\\ Text.app/Contents/SharedSupport/bin/subl -n -w
abbrev = 40
# for some reason the cmd below doesn't work
#editor = subl -n -w
[color]
ui = auto
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = cyan bold
branch = cyan bold
changed = magenta bold
deleted = red bold
untracked = yellow bold
[alias]
s = status -s
l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --stat
root = rev-parse --show-toplevel
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[push]
[push]
default = simple
[help]
autocorrect = 0
[difftool "sourcetree"]
cmd = /usr/local/bin/ksdiff -w \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
# OS X
.DS_STORE
# IntelliJ
.idea
# vim...
[._]*.s[a-w][a-z]
[._]s[a-w][a-z]
*.un~
Session.vim
*~
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment