|
|
|
@@ -1,15 +1,12 @@ |
|
|
|
[alias] |
|
|
|
up = !sh -c 'git pull --rebase && git push' |
|
|
|
# 1.8.4+ only for ignore-all-space |
|
|
|
wsldiff = diff --color-words --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-all-space |
|
|
|
wsdiff = diff --color-words --ignore-space-at-eol --ignore-space-change --ignore-all-space |
|
|
|
wsdiff = diff --color-words --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-all-space |
|
|
|
wdiff = diff --color-words |
|
|
|
ci = commit |
|
|
|
ciu = commit --all |
|
|
|
co = checkout |
|
|
|
ba = branch --all |
|
|
|
st = status --short --branch |
|
|
|
pak = repack -a -d -f --depth=2000 --window=2000 |
|
|
|
unstage = reset HEAD |
|
|
|
tlog = log --graph --color=always --abbrev-commit --date=relative --pretty=oneline |
|
|
|
hist = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative |
|
|
|
@@ -18,3 +15,9 @@ |
|
|
|
squash = commit --squash |
|
|
|
ri = rebase --interactive --autosquash |
|
|
|
ra = rebase --abort |
|
|
|
effit = reset --hard |
|
|
|
# What commits differ beteen branches, note, equivalent commits are omitted. |
|
|
|
# Use this with three dot operator aka master...origin/master |
|
|
|
cdiff = log --left-right --graph --cherry-pick --oneline |
|
|
|
# Same as ^ only equivalent commits are listed with a = sign. |
|
|
|
cmdiff = log --left-right --graph --cherry-pick --oneline |