[user]
- name = Hendrik Jäger
- email = hendrik@securosys.ch
+ name = Hendrik Jäger
+ email = hendrik@securosys.ch
# push/pull/diff/options
[push]
cl = clone
ci = commit
co = checkout
+ cob = checkout -b
br = branch
r = reset
cp = cherry-pick
# commit {{{
cm = commit -m
cma = commit -a -m
+ cmv = commit -a -v
ca = commit --amend
amend = commit --amend
caa = commit -a --amend -C HEAD
lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
fl = log -u
filelog = log -u
+ lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
+ lga = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all
# }}}
# diff {{{
d = diff --word-diff
# }}}
# various useful {{{
# last tag created
- lasttag = describe --tags --abbrev=0
- lt = describe --tags --abbrev=0
+ lasttag = "describe --tags --abbrev=0"
+ lt = "describe --tags --abbrev=0"
+
+ # tag logs
+ taglog = "log --tags --simplify-by-decoration --pretty='format:%ci %d'"
# conflict/merges
ours = "!f() { git co --ours $@ && git add $@; }; f"