Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Tree: aae6c0ea64
Fetching contributors…

Cannot retrieve contributors at this time

95 lines (66 sloc) 2.363 kB
[user]
name = Steve Losh
email = steve@stevelosh.com
[core]
pager = cat
editor = vim
excludesfile = /Users/sjl/.gitignore
[alias]
tags = tag -l
branches = branch -a
remotes = remote -v
; make-the-fucking-branch-point-at-this-fucking-commit = !sh -c "git checkout $1 && git reset --hard $2" -
root = rev-parse --show-toplevel
graft = cherry-pick -x
l = log -18 --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset'
ll = log --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset'
gl = log -12 --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(black bold)(by %an)%Creset%C(yellow bold)%d%Creset%n'
gll = log --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(black bold)(%cr by %an)%Creset%C(yellow bold)%d%Creset%n'
pull = pull --ff-only
up = merge --ff-only
join = merge --no-ff
discard-merge = reset --hard HEAD
ci = commit
cm = commit -m
d = !git diff | vim -R -
di = !git diff --cached | vim -R -
co = checkout
id = rev-parse
stat = status
st = status
unstage = reset HEAD
uns = reset HEAD
delete-local-branch = branch -D
delete-remote-branch = push origin --delete
delete-local-reference-to-remote-branch = branch -rd
currentbranch = !git branch --contains HEAD | grep '*' | tr -s ' ' | cut -d ' ' -f2
fo = fetch origin
fu = fetch upstream
po = push origin
; lo = pull origin
mo = !git merge --no-ff origin/`git currentbranch`
mu = !git merge --no-ff upstream/`git currentbranch`
uo = !git merge --ff-only origin/`git currentbranch`
uu = !git merge --ff-only upstream/`git currentbranch`
addremove = !git add . && git add -u
addrem = !git addremove
[push]
default = current
[color]
branch = auto
diff = auto
interactive = auto
status = auto
[difftool "Kaleidoscope"]
cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[diff]
tool = Kaleidoscope
[merge]
tool = splice
[mergetool "splice"]
cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true
[web]
browser = open
Jump to Line
Something went wrong with that request. Please try again.