17 br = branch |
17 br = branch |
18 staged = diff --cached |
18 staged = diff --cached |
19 unstage = reset HEAD -- |
19 unstage = reset HEAD -- |
20 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
20 update = "!git remote update -p && git merge --ff-only --stat @{u}" |
21 in = "!git remote update -p; git log ..@{u}" |
21 in = "!git remote update -p; git log ..@{u}" |
22 out = log @{u}.. |
22 out = "!git glog @{u}.." |
23 new = !sh -c 'git log $1@{1}..$1@{0}' "$@" |
23 new = !sh -c 'git log $1@{1}..$1@{0}' "$@" |
24 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" |
24 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" |
25 ctags = "!~/.git_helpers/ctags" |
25 ctags = "!~/.git_helpers/ctags" |
26 glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative |
26 glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative |
27 recent = !sh -c 'git for-each-ref --count=${1:-20} --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\"' "$@" |
27 recent = !sh -c 'git for-each-ref --count=${1:-20} --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\"' "$@" |