Skip to content

Instantly share code, notes, and snippets.

@sionescu sionescu/.gitconfig
Created Dec 11, 2014

Embed
What would you like to do?
GIT configuration
[branch]
autosetupmerge = true
autosetuprebase = remote
[color]
ui = auto
[alias]
l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
rlog = log --pretty=format:'%h %Cblue%cr%Creset %cn %Cgreen%s%Creset'
find = log --pretty=\"format:%Cgreen%H %Cblue%s\" --name-status --grep
up = pull --rebase --stat
changes = diff --name-status -r
wdiff = diff --color-words
wshow = show --color-words
co = checkout
ci = commit
rb = rebase
st = status
br = branch
praise = blame
[merge]
keepBackup = false;
tool = p4merge
stat = true
[mergetool "p4merge"]
cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
keepTemporaries = false
trustExitCode = false
keepBackup = false
[diff]
tool = meld
renames = copies
mnemonicprefix = true
[gc]
auto = 25
[core]
autocrlf = input
safecrlf = true
abbrev = 12
pager = less -F -X
whitespace = trailing-space,space-before-tab
[push]
default = tracking
[pull]
rebase = true
[advice]
pushNonFastForward = false
statusHints = false
[rerere]
enabled = true
[mergetool]
writeToTemp = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.