Skip to content

Instantly share code, notes, and snippets.

@MichaelBlume
Created April 12, 2011 17:51
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save MichaelBlume/916019 to your computer and use it in GitHub Desktop.
Save MichaelBlume/916019 to your computer and use it in GitHub Desktop.
my git config file
[advice]
# I know this stuff by now
pushNonFastForward = false
statusHints = false
[alias]
a = add
ai = add --interactive
ap = add --patch
b = branch
bl = blame
c = commit
ca = commit --all
cm = commit --amend
cam = commit --all --amend
cb = checkout -b
cd = commit --all -m "dirty"
cl = clone
co = checkout
cp = cherry-pick
cpx = cherry-pick -x
d = diff
db = branch -D
e = checkout -p
f = fetch
fa = fetch --all
g = grep
h = help
irb = rebase --interactive
irbm = rebase --interactive master
irbo = rebase --interactive HEAD@{upstream}
k = !gitk
ka = !gitk --all
l = log
lp = log -p
ls = ls-files
m = merge
mm = merge --no-ff
pl = pull
pr = pull --rebase
ps = push
r = remote
rb = rebase
rba = rebase --abort
rbc = rebase --continue
rbm = rebase master
rbo = rebase HEAD@{upstream}
rbs = rebase --skip
rh = reset --hard
rl = reflog
rs = reset --soft
rv = revert
rx = reset --mixed
s = status
sf = svn fetch
sh = show
sps = svn dcommit
srb = svn rebase
st = stash
sta = stash apply
stc = stash clear
# try to use this one instead
stp = stash pop
uc = reset --mixed HEAD^
[apply]
# wish this worked with commits
whitespace = fix
[branch]
# when I branch off a remote checkout, set up tracking.
autosetupmerge = true
[color]
ui = auto
[core]
editor = /usr/bin/vim
excludesfile = /home/mike/.gitignoreglobal
# x bits on scripts are often set false in a repo
filemode = false
# be strict
whitespace = fix,trailing-space,space-before-tab, tab-in-indent, tabwidth=4
[diff]
# notice if I pull some text out of a file
renames = copies
# a,b = not so helpful
mnemonicprefix = true
[github]
user = MichaelBlume
[grep]
# show line numbers when I git-grep
lineNumber = true
[log]
# show where branches are in log
decorate = short
[push]
# don't push all the branches!
default = current
[receive]
# allow push -f
denyCurrentBranch = warn
[rebase]
# show a diffstat after rebasing
stat = true
[svn]
authorsfile = /home/mike/.svn_authors
[user]
# Hey look, it's me.
name = Mike Blume
email = mike@loggly.com
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment