Skip to content

Instantly share code, notes, and snippets.

@wwgist
Created February 20, 2013 17:00
Show Gist options
  • Save wwgist/4997082 to your computer and use it in GitHub Desktop.
Save wwgist/4997082 to your computer and use it in GitHub Desktop.
GIT: .gitconfig
[user]
name = wowkalucky
email = [email protected]
[core]
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
excludesfile = ~/.gitignore
editor = nano
[color]
ui = true
[color "branch"]
current = yellow bold
local = green bold
remote = cyan bold
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "status"]
added = green bold
changed = yellow bold
untracked = red bold
[alias]
co = checkout
ci = commit
st = status
br = branch
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
type = cat-file -t
dump = cat-file -p
logp = log --pretty=format:\"%h — %an: %s\"
[merge]
tool = mymeld
conflictstyle = diff3
[mergetool "mymeld"]
cmd = meld --diff $BASE $LOCAL --diff $BASE $REMOTE --diff $LOCAL $BASE $REMOTE $MERGED
[diff]
tool = meld
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment