2012-02-26 19:38:01 +00:00
|
|
|
[user]
|
2013-12-28 17:37:46 +00:00
|
|
|
name = Dan Buch
|
|
|
|
email = dan@meatballhat.com
|
|
|
|
|
|
|
|
[github]
|
|
|
|
user = meatballhat
|
2012-02-26 19:38:01 +00:00
|
|
|
|
|
|
|
[core]
|
2013-12-28 17:37:46 +00:00
|
|
|
excludesfile = ~/.git-global-ignores
|
2014-09-27 00:26:09 +00:00
|
|
|
editor = vim
|
|
|
|
filemode = true
|
2013-12-28 17:37:46 +00:00
|
|
|
autocrlf = false
|
|
|
|
pager = less -FRX
|
2012-02-26 19:38:01 +00:00
|
|
|
|
2014-09-27 00:26:09 +00:00
|
|
|
[branch]
|
|
|
|
autosetuprebase = remote
|
|
|
|
autosetupmerge = true
|
|
|
|
mergeoptions = --no-commit --no-ff
|
|
|
|
|
2012-02-26 19:38:01 +00:00
|
|
|
[daemon]
|
2013-12-28 17:37:46 +00:00
|
|
|
uploadpack = true
|
|
|
|
uploadarch = true
|
|
|
|
receivepack = true
|
2012-02-26 19:38:01 +00:00
|
|
|
|
2013-01-20 04:08:18 +00:00
|
|
|
[push]
|
2014-09-27 00:26:09 +00:00
|
|
|
default = current
|
2013-01-20 04:08:18 +00:00
|
|
|
|
2012-02-26 19:38:01 +00:00
|
|
|
[color]
|
2013-12-28 17:37:46 +00:00
|
|
|
ui = auto
|
2012-02-26 19:38:01 +00:00
|
|
|
|
|
|
|
[color "branch"]
|
2013-12-28 17:37:46 +00:00
|
|
|
current = yellow reverse
|
|
|
|
local = yellow
|
|
|
|
remote = green
|
2012-02-26 19:38:01 +00:00
|
|
|
|
|
|
|
[color "diff"]
|
2013-12-28 17:37:46 +00:00
|
|
|
meta = yellow bold
|
|
|
|
frag = magenta bold
|
|
|
|
old = red bold
|
|
|
|
new = green bold
|
2012-02-26 19:38:01 +00:00
|
|
|
|
|
|
|
[color "status"]
|
2013-12-28 17:37:46 +00:00
|
|
|
added = yellow
|
|
|
|
changed = green
|
|
|
|
untracked = cyan
|
2012-02-26 19:38:01 +00:00
|
|
|
|
|
|
|
[alias]
|
2013-12-28 17:37:46 +00:00
|
|
|
a = add
|
|
|
|
ad = add
|
|
|
|
addd = add
|
|
|
|
br = branch
|
|
|
|
bra = branch -a
|
|
|
|
brr = branch -r
|
|
|
|
ci = commit
|
|
|
|
co = checkout
|
|
|
|
d = diff
|
|
|
|
dc = diff --cached
|
|
|
|
di = diff
|
|
|
|
dif = diff
|
|
|
|
l = ls-files
|
|
|
|
ls = ls-files
|
|
|
|
nuke = clean -dfx
|
|
|
|
pr = pull --rebase
|
|
|
|
s = status --short
|
|
|
|
st = status
|
|
|
|
sta = stash
|
|
|
|
stcq = diff --cached --name-only
|
|
|
|
stq = diff --name-only
|
|
|
|
t = tag
|
|
|
|
ta = tag
|
|
|
|
tags = tag
|
|
|
|
|
|
|
|
slog = log git-svn..
|
|
|
|
sup = svn fetch --all
|
|
|
|
spush = svn dcommit
|
|
|
|
srb = rebase git-svn
|
|
|
|
|
|
|
|
cm = checkout master
|
|
|
|
lm = log master..
|
|
|
|
|
|
|
|
rt = rebase trunk
|
|
|
|
lt = log trunk..
|
|
|
|
ct = checkout svn/trunk
|
|
|
|
|
|
|
|
logv = log --name-status
|
2012-02-26 19:38:01 +00:00
|
|
|
|
|
|
|
[clean]
|
2013-12-28 17:37:46 +00:00
|
|
|
requireForce = false
|
2012-02-26 19:38:01 +00:00
|
|
|
|
2013-12-28 17:37:46 +00:00
|
|
|
# vim: set filetype=cfg noexpandtab:
|