21 st = status -sb |
21 st = status -sb |
22 co = checkout |
22 co = checkout |
23 br = branch |
23 br = branch |
24 staged = diff --cached |
24 staged = diff --cached |
25 unstage = reset HEAD -- |
25 unstage = reset HEAD -- |
26 up = pull --all --prune -r --autostash |
26 up = pull -r --all --prune |
27 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
27 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
28 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
28 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
29 out = "!git log --pretty=onelinecustom @{u}.." |
29 out = "!git log --pretty=onelinecustom @{u}.." |
30 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" |
30 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" |
31 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" |
31 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" |