Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tree: 070c0a6203
Fetching contributors…

Cannot retrieve contributors at this time

file 104 lines (101 sloc) 2.761 kb
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104
# This came from Greg V's dotfiles:
# https://github.com/myfreeweb/dotfiles
# Feel free to steal it, but attribution is nice
#
# thanks:
# https://github.com/ornicar/dotfiles/blob/master/gitconfig
# https://github.com/paulirish/dotfiles/blob/master/.gitconfig
# https://github.com/garybernhardt/dotfiles/blob/master/.githelpers

[core]
excludesfile = ~/.gitignore
whitespace = fix,space-before-tab,tab-in-indent,trailing-space
legacyheaders = false
quotepath = false
pager = $PAGER
trustctime = false
[repack]
usedeltabaseoffset = true
[apply]
whitespace = fix
[user]
name = myfreeweb
email = floatboth@me.com
[github]
user = myfreeweb
[difftool]
prompt = false
[diff]
renames = copy
tool = vimdiff
wordRegex = [^[:space:]]
mnemonicprefix = true
[mergetool "splice"]
cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true
[merge]
summary = true
tool = splice
[push]
default = tracking
[branch]
autosetupmerge = always
[color]
ui = auto
interactive = auto

[alias] # object -> verb -> option
# common verbs: [c]reate, [l]ist, [d]iff, [r]eset/[r]emove
# [b]ranch
bc = checkout -b
bce = checkout --orphan
bl = branch --verbose
bm = merge
bmt = mergetool
br = branch -d
bR = branch -D
brc = rebase --continue
brs = rebase --skip
bs = checkout # [s]witch
# [c]ommit
ca = commit --amend
cc = commit
cd = diff --color-words
cl = !git log --decorate --graph --abbrev-commit --date=relative --pretty='tformat:%C(yellow)%h%Creset}%Cgreen(%ar)%Creset}%C(bold blue)<%an>%Creset}%C(red)%d%Creset %s' $* | sed -Ee 's/(^[^<]*) ago)/\\1)/' | sed -Ee 's/(^[^<]*), [[:digit:]]+ .*months?)/\\1)/' | column -t -s '}' | less -FXRS
cp = cherry-pick -x
cr = reset --hard HEAD^
cs = show
# [f]ile
fa = add
faa = !git add --all && git ws
fc = !touch $@ && git add $@ && $EDITOR $1
ff = rm --cached # [f]orget
fm = mv # [m]ove
fr = rm
fu = reset HEAD
# [r]emote
r = remote
rc = remote add
rco = remote add origin
rl = remote -v
rr = remote rm
rp = !git push && git push --tags
# [s]ubmodule
sc = submodule add
scm = submodule foreach --recursive git checkout master
sl = submodule --quiet foreach --recursive echo $path on $(git rev-parse --abbrev-ref HEAD)
sr = submodulerm
ss = !git submodule sync && git submodule update --init --recursive # [s]ync
su = submodule foreach --recursive git pull # [u]pdate
# [t]ag
tc = tag
tl = tag -n1 --list
tr = tag -d
# [w]orking copy
wd = diff --color-words --cached
wr = reset --hard HEAD
ws = status --short --branch --ignore-submodules=untracked

[url "git://github.com/"]
insteadOf = gh:
[url "git@github.com:"]
pushInsteadOf = "git://github.com/"
[url "git@github.com:myfreeweb/"]
insteadOf = my:
Something went wrong with that request. Please try again.