Permalink
Switch branches/tags
Nothing to show
Find file Copy path
Fetching contributors…
Cannot retrieve contributors at this time
48 lines (47 sloc) 1.15 KB
[user]
name = xhh
email = xhh@xhh.me
[alias]
s = status
co = checkout
wc = whatchanged
sfetch = svn fetch
spull = svn rebase
spush = svn dcommit
ci = commit
br = branch
pusho = push origin
pullo = pull origin
fp = fetch --prune
pp = pull --rebase --prune
pf = pull --ff-only
mm = merge origin/master
mf = merge origin/master --ff-only
rbom = rebase origin/master
dm = diff origin/master
df = diff
dfc = diff --cached
last = log -1 HEAD
l = log --pretty=format:"%Cblue%ar%Creset%x09%an%x09%Cblue%h%Creset%x20%x20%s"
lg = log --graph --pretty=format:"%Cblue%ar%Creset%x09%an%x09%Cblue%h%Creset%x20%x20%s"
amend = commit --amend
# re-branch by "rebase master"
unstage = reset HEAD --
f = flow
review = log -p --since=yesterday --reverse --stat
[merge]
tool = vim
[mergetool "vim"]
cmd = "vim --noplugin \"$PWD/$MERGED\" \
+\":split $PWD/$REMOTE\" +\":set buftype=nowrite\" \
+\":vertical diffsplit $PWD/$LOCAL\" +\":set buftype=nowrite\" \
+\":vertical diffsplit $PWD/$BASE\" +\":set buftype=nowrite\" \
+\":wincmd l\""
[color]
ui = auto
[log]
date = local
[core]
autocrlf = input
[push]
default = upstream