Skip to content

Instantly share code, notes, and snippets.

@feniix
Created May 25, 2014 21:52
Show Gist options
  • Save feniix/3b8a84b696c390d4a7e8 to your computer and use it in GitHub Desktop.
Save feniix/3b8a84b696c390d4a7e8 to your computer and use it in GitHub Desktop.
[user]
name = Sebastian Otaegui
email = [email protected]
[credential]
helper = osxkeychain
[push]
default = tracking
[merge]
tool = diffmerge
stat = true
[mergetool "diffmerge"]
trustExitCode = true
cmd = /usr/local/bin/diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
[alias]
s = status
ci = commit
br = branch
co = checkout
df = diff
lg = log
l = log --graph --pretty=format:'%C(yellow)%h%C(cyan)%d%Creset %s %C(white)- %an, %ar%Creset'
[core]
autocrlf = input
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
excludesfile = ~/.gitignore_global
quotepath = false
[rebase]
autosquash = true
[branch]
autosetupmerge = always
[diff]
renames = copies
mnemonicprefix = true
[color]
ui = true
[color "branch"]
current = yellow black
local = yellow
remote = magenta
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red reverse
new = green reverse
whitespace = white reverse
[color "status"]
added = green
changed = yellow
untracked = cyan reverse
branch = magenta
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment