Created
March 4, 2015 11:12
-
-
Save damianidaniele/4542670eeb7fa8a06236 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[user] | |
name = Daniele Damiani | |
email = [email protected] | |
[core] | |
editor = vim | |
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol | |
excludesfile = /home/dsdw/.gitignore | |
[web] | |
browser = google-chrome | |
[rerere] | |
enabled = 1 | |
autoupdate = 1 | |
[alias] | |
s = status | |
sb = status -s -b | |
############# | |
sa = stash apply | |
sc = stash clear | |
sd = stash drop | |
sl = stash list | |
sp = stash pop | |
ss = stash save | |
############# | |
d = diff | |
dc = diff --cached | |
dk = diff --check | |
dck = diff --cached --check | |
di = diff --word-diff | |
dty = difftool -y | |
dtd = difftool -d | |
############# | |
c = commit | |
ca = commit -a | |
cm = commit -m | |
cam = commit -am | |
cd = commit --amend | |
cad = commit -a --amend | |
############# | |
a = add . | |
############# | |
ap = apply | |
as = apply --stat | |
ac = apply --check | |
############# | |
l = log --oneline | |
ll = log --oneline --decorate=short | |
lll = log --graph --pretty=format:'%C(yellow)%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --date=relative | |
llll = log --oneline --decorate --stat --graph | |
lg = log --oneline --graph --decorate | |
############# | |
o = checkout | |
ob = checkout -b | |
############# | |
b = branch | |
ba = branch -a | |
bd = branch -d | |
br = branch -r | |
############# | |
f = fetch | |
fo = fetch origin | |
############# | |
fp = format-patch | |
############# | |
fk = fsck | |
############# | |
m = merge | |
############# | |
pr = prune -v | |
############# | |
ps = push | |
pl = pull | |
pb = pull --rebase | |
psf = push -f | |
psu = push -u | |
plu = pull -u | |
pso = push origin | |
plo = pull origin | |
psp = push upstream | |
plp = pull upstream | |
pbo = pull --rebase origin | |
pbp = pull --rebase upstream | |
psfo = push -f origin | |
psuo = push -u origin | |
pluo = pull -u origin | |
############# | |
rb = rebase | |
############# | |
re = reset | |
rh = reset HEAD | |
reh = reset --hard | |
rem = reset --mixed | |
res = reset --soft | |
rehh = reset --hard HEAD | |
remh = reset --mixed HEAD | |
resh = reset --soft HEAD | |
############# | |
r = remote | |
ra = remote add | |
rm = remote rm | |
rv = remote -v | |
rp = remote prune | |
rs = remote show | |
rso = remote show origin | |
rpo = remote prune origin | |
############# | |
w = show | |
############# | |
meldon = config diff.external /home/darsadow/.meld.py | |
meldof = config --remove-section diff | |
############# | |
human = name-rev --name-only --refs=refs/heads/* | |
[color] | |
ui = true | |
[color "branch"] | |
current = yellow bold | |
local = green bold | |
remote = cyan bold | |
[color "diff"] | |
meta = yellow bold | |
frag = magenta bold | |
old = red bold | |
new = green bold | |
whitespace = red reverse | |
[color "status"] | |
added = green bold | |
changed = yellow bold | |
untracked = red bold | |
[push] | |
default = tracking | |
[pull] | |
reabse = true | |
[branch] | |
autosetupmerge = true | |
[diff] | |
tool = vimdiff | |
[difftool] | |
prompt = false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment