16 |
16 |
17 [diff] |
17 [diff] |
18 compactionheuristic = true |
18 compactionheuristic = true |
19 |
19 |
20 [alias] |
20 [alias] |
21 ci = commit |
21 ci = commit |
22 rec = commit -p |
22 rec = commit -p |
23 unrec = checkout --patch |
23 unrec = checkout --patch |
24 amend = commit -p --amend |
24 amend = commit -p --amend |
25 st = status -sb |
25 st = status -sb |
26 co = checkout |
26 co = checkout |
27 br = branch |
27 br = branch |
28 staged = diff --cached |
28 staged = diff --cached |
29 unstage = reset HEAD -- |
29 unstage = reset HEAD -- |
30 rollback = reset --soft ^HEAD |
30 rollback = reset --soft ^HEAD |
31 up = pull -r --prune |
31 up = pull -r --prune |
32 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
32 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
33 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
33 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
34 out = "!git log --pretty=onelinecustom @{u}.." |
34 out = "!git log --pretty=onelinecustom @{u}.." |
35 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" |
35 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" |
36 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" |
36 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" |
37 glog = log --graph --pretty=onelinecustom |
37 glog = log --graph --pretty=onelinecustom |
38 recent = !sh -c 'git for-each-ref --count=${1:-20} --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\" ${@:2}' - |
38 recent = !sh -c 'git for-each-ref --count=${1:-20} --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\" ${@:2}' - |
39 |
39 |
40 [pretty] |
40 [pretty] |
41 onelinecustom = tformat:%C(magenta)%h%Creset %G? -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset |
41 onelinecustom = tformat:%C(magenta)%h%Creset %G? -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset |
42 |
42 |
43 [branch] |
43 [branch] |