Skip to content

Instantly share code, notes, and snippets.

@hrp
Created December 28, 2013 01:01
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 hrp/8154791 to your computer and use it in GitHub Desktop.
Save hrp/8154791 to your computer and use it in GitHub Desktop.
gitconfig
[alias]
co = checkout
st = status
br = branch
ci = commit
cm = commit -m
cia = commit -a
lg = log -p
df = diff
dc = diff --cached
gr = grep --color
d = difftool
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
ls = ls-files
# Handles some weirdness in my brain
branches = branch
# Show files ignored by git:
ign = ls-files -o -i --exclude-standard
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[color]
ui = true
[color "diff"]
whitespace = red reverse
[core]
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
[core]
excludesfile = /Users/hiten/.gitignore
editor = /usr/bin/vim
autocrlf = input
quotepath = false
[apply]
whitespace = nowarn
[format]
pretty = %C(yellow)%h%Creset %s %C(red)(%an, %cr)%Creset
[diff]
tool = vimdiff
[difftool]
prompt = false
[difftool "sourcetree"]
cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = true
[branch]
autosetupmerge = true
[push]
default = tracking
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment