More.
author |
Steve Losh <steve@stevelosh.com> |
date |
Mon, 08 Apr 2013 11:15:28 -0400 |
parents |
3b3fba62fdbb |
children |
78862604f6c8 |
[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-the-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
ack = log --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset' --full-history -S
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 = rev-parse --abbrev-ref HEAD
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
ksdiff = difftool -y -t Kaleidoscope
ksshow = "!sh -c 'git ksdiff $1^..$1;' -"
sl = "!sh -c 'git show --color=always $1 | less -R' -"
[push]
default = current
[color]
branch = auto
diff = auto
interactive = auto
status = auto
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[diff]
tool = Kaleidoscope
[merge]
tool = splice
[mergetool "splice"]
cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
[web]
browser = open