zsh/aliases/git.zsh

   1 # Aliases
   2 alias g='git'
   3
   4 alias gst='git status'
   5 alias gsts='git status -s'
   6
   7 alias gl='git pull'
   8 alias gup='git pull --rebase'
   9
  10 alias gp='git push'
  11 alias gpf='git push --force-with-lease'
  12
  13 alias gd='git diff'
  14 alias gdc='git diff --cached'
  15 function gdm { gd "${1:-origin}".. }
  16 compdef _git gdm=git-diff
  17
  18 alias gc='git commit -v'
  19 alias gcs='git commit -v --squash'
  20 alias gcf='git commit -v --fixup'
  21 alias gca='git commit -v -a'
  22 alias gcaf='git commit -v -a --fixup'
  23
  24 alias gco='git checkout'
  25 alias gcm='git checkout master'
  26
  27 alias gs='git stash save'
  28 alias gsa='git stash apply'
  29 alias gsp='git stash pop'
  30 alias gsd='git stash drop'
  31 alias gsl='git --no-pager stash list'
  32 alias gss='git stash show --patch'
  33
  34 alias gr='git remote'
  35 alias grv='git remote -v'
  36 alias grmv='git remote rename'
  37 alias grrm='git remote remove'
  38 alias grset='git remote set-url'
  39 alias grup='git remote update'
  40
  41 alias gb='git branch -vv'
  42 alias gba='git branch -a'
  43 alias gbm='git branch --merged'
  44 alias gbdm='git branch --merged | grep -ve "\*" -e "master" | xargs git branch -d'
  45
  46 alias gcl='git config --list'
  47 alias gcp='git cherry-pick'
  48
  49 alias gcount='git shortlog -sn'
  50 alias glg='git --no-pager log --oneline --graph --max-count=20 --decorate'
  51 alias glg='git --no-pager log --graph --max-count=20 --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'
  52 function glm { glg "${1:-origin}".. }
  53 compdef _git glm=git-log
  54 alias glgl='git log --graph --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'
  55 alias glgg='git log --stat --graph --max-count=20 --decorate'
  56 alias glgga='git log --stat --graph --decorate --all'
  57
  58 alias ga='git add'
  59
  60 alias gm='git merge'
  61
  62 alias grh='git reset HEAD'
  63 alias grhh='git reset HEAD --hard'
  64
  65 alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
  66
  67 alias gf='git ls-files | grep'
  68
  69 alias gpoat='git push origin --all && git push origin --tags'
  70
  71 # cd into the top of the current repository
  72 # or submodule.
  73 alias cdr='cd $(git rev-parse --show-toplevel || echo ".")'
  74
  75 # Git and svn mix
  76 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
  77
  78 alias gsr='git svn rebase'
  79 alias gsd='git svn dcommit'
  80
  81 # return the current branch name
  82 # Usage example: git pull origin $(current_branch)
  83 function current_branch() {
  84   ref=$(git symbolic-ref HEAD 2> /dev/null) || \
  85   ref=$(git rev-parse --short HEAD 2> /dev/null) || return
  86   echo ${ref#refs/heads/}
  87 }
  88
  89 function current_repository() {
  90   ref=$(git symbolic-ref HEAD 2> /dev/null) || \
  91   ref=$(git rev-parse --short HEAD 2> /dev/null) || return
  92   echo $(git remote -v | cut -d':' -f 2)
  93 }
  94
  95 # these aliases take advantage of the previous function
  96 alias ggpull='git pull origin $(current_branch)'
  97 alias ggpush='git push origin $(current_branch)'
  98 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'