25 up = pull -r --prune |
25 up = pull -r --prune |
26 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
26 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
27 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
27 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
28 out = "!git log --pretty=onelinecustom @{u}.." |
28 out = "!git log --pretty=onelinecustom @{u}.." |
29 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" |
29 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" |
30 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" |
|
31 glog = log --graph --pretty=onelinecustom |
30 glog = log --graph --pretty=onelinecustom |
32 recent = "!f() { git for-each-ref --count=20 --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\" ${1:-refs/heads} ${@:2}; }; f" |
31 recent = "!f() { git for-each-ref --count=20 --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\" ${1:-refs/heads} ${@:2}; }; f" |
33 |
32 |
34 [pretty] |
33 [pretty] |
35 onelinecustom = tformat:%C(magenta)%h%Creset %G? -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset |
34 onelinecustom = tformat:%C(magenta)%h%Creset %G? -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset |