18 st = status -sb |
18 st = status -sb |
19 co = checkout |
19 co = checkout |
20 br = branch |
20 br = branch |
21 staged = diff --cached |
21 staged = diff --cached |
22 unstage = reset HEAD -- |
22 unstage = reset HEAD -- |
23 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
23 fetch = "!git remote update -p && git rebase --stat @{u}" |
24 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
24 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" |
25 out = "!git log --pretty=onelinecustom @{u}.." |
25 out = "!git log --pretty=onelinecustom @{u}.." |
26 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" |
26 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" |
27 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" |
27 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" |
28 ctags = "!~/.git_helpers/ctags" |
28 ctags = "!~/.git_helpers/ctags" |