git.plugin.zsh 5.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179
  1. # Aliases
  2. alias g='git'
  3. compdef g=git
  4. alias gst='git status'
  5. compdef _git gst=git-status
  6. alias gd='git diff'
  7. compdef _git gd=git-diff
  8. alias gdc='git diff --cached'
  9. compdef _git gdc=git-diff
  10. alias gdt='git diff-tree --no-commit-id --name-only -r'
  11. compdef _git gdc=git diff-tree --no-commit-id --name-only -r
  12. alias gl='git pull'
  13. compdef _git gl=git-pull
  14. alias gup='git pull --rebase'
  15. compdef _git gup=git-fetch
  16. alias gp='git push'
  17. compdef _git gp=git-push
  18. alias gd='git diff'
  19. gdv() { git diff -w "$@" | view - }
  20. compdef _git gdv=git-diff
  21. alias gc='git commit -v'
  22. compdef _git gc=git-commit
  23. alias gc!='git commit -v --amend'
  24. compdef _git gc!=git-commit
  25. alias gca='git commit -v -a'
  26. compdef _git gc=git-commit
  27. alias gca!='git commit -v -a --amend'
  28. compdef _git gca!=git-commit
  29. alias gcmsg='git commit -m'
  30. compdef _git gcmsg=git-commit
  31. alias gco='git checkout'
  32. compdef _git gco=git-checkout
  33. alias gcm='git checkout master'
  34. alias gr='git remote'
  35. compdef _git gr=git-remote
  36. alias grv='git remote -v'
  37. compdef _git grv=git-remote
  38. alias grmv='git remote rename'
  39. compdef _git grmv=git-remote
  40. alias grrm='git remote remove'
  41. compdef _git grrm=git-remote
  42. alias grset='git remote set-url'
  43. compdef _git grset=git-remote
  44. alias grup='git remote update'
  45. compdef _git grset=git-remote
  46. alias grbi='git rebase -i'
  47. compdef _git grbi=git-rebase
  48. alias grbc='git rebase --continue'
  49. compdef _git grbc=git-rebase
  50. alias grba='git rebase --abort'
  51. compdef _git grba=git-rebase
  52. alias gb='git branch'
  53. compdef _git gb=git-branch
  54. alias gba='git branch -a'
  55. compdef _git gba=git-branch
  56. alias gbr='git branch --remote'
  57. alias gcount='git shortlog -sn'
  58. compdef gcount=git
  59. alias gcl='git config --list'
  60. alias gcp='git cherry-pick'
  61. compdef _git gcp=git-cherry-pick
  62. alias glg='git log --stat --max-count=10'
  63. compdef _git glg=git-log
  64. alias glgg='git log --graph --max-count=10'
  65. compdef _git glgg=git-log
  66. alias glgga='git log --graph --decorate --all'
  67. compdef _git glgga=git-log
  68. alias glo='git log --oneline --decorate --color'
  69. compdef _git glo=git-log
  70. alias glog='git log --oneline --decorate --color --graph'
  71. compdef _git glog=git-log
  72. alias gss='git status -s'
  73. compdef _git gss=git-status
  74. alias ga='git add'
  75. compdef _git ga=git-add
  76. alias gm='git merge'
  77. compdef _git gm=git-merge
  78. alias grh='git reset HEAD'
  79. alias grhh='git reset HEAD --hard'
  80. alias gclean='git reset --hard && git clean -dfx'
  81. alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
  82. # Sign and verify commits with GPG
  83. alias gcs='git commit -S'
  84. compdef _git gcs=git-commit
  85. alias gsps='git show --pretty=short --show-signature'
  86. compdef _git gsps=git-show
  87. # Sign and verify tags with GPG
  88. alias gts='git tag -s'
  89. compdef _git gts=git-tag
  90. alias gvt='git verify-tag'
  91. compdef _git gvt=git verify-tag
  92. #remove the gf alias
  93. #alias gf='git ls-files | grep'
  94. alias gpoat='git push origin --all && git push origin --tags'
  95. alias gmt='git mergetool --no-prompt'
  96. compdef _git gm=git-mergetool
  97. alias gg='git gui citool'
  98. alias gga='git gui citool --amend'
  99. alias gk='gitk --all --branches'
  100. alias gsts='git stash show --text'
  101. alias gsta='git stash'
  102. alias gstp='git stash pop'
  103. alias gstd='git stash drop'
  104. # Will cd into the top of the current repository
  105. # or submodule.
  106. alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
  107. # Git and svn mix
  108. alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
  109. compdef git-svn-dcommit-push=git
  110. alias gsr='git svn rebase'
  111. alias gsd='git svn dcommit'
  112. #
  113. # Will return the current branch name
  114. # Usage example: git pull origin $(current_branch)
  115. #
  116. function current_branch() {
  117. if [ ! -d .git ]; then return; fi
  118. ref=$(git symbolic-ref HEAD 2> /dev/null) || \
  119. ref=$(git rev-parse --short HEAD 2> /dev/null) || return
  120. echo ${ref#refs/heads/}
  121. }
  122. function current_repository() {
  123. if [ ! -d .git ]; then return; fi
  124. ref=$(git symbolic-ref HEAD 2> /dev/null) || \
  125. ref=$(git rev-parse --short HEAD 2> /dev/null) || return
  126. echo $(git remote -v | cut -d':' -f 2)
  127. }
  128. # these aliases take advantage of the previous function
  129. alias ggpull='git pull origin $(current_branch)'
  130. compdef ggpull=git
  131. alias ggpur='git pull --rebase origin $(current_branch)'
  132. compdef ggpur=git
  133. alias ggpush='git push origin $(current_branch)'
  134. compdef ggpush=git
  135. alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
  136. compdef ggpnp=git
  137. # Pretty log messages
  138. function _git_log_prettily(){
  139. if ! [ -z $1 ]; then
  140. git log --pretty=$1
  141. fi
  142. }
  143. alias glp="_git_log_prettily"
  144. compdef _git glp=git-log
  145. # Work In Progress (wip)
  146. # These features allow to pause a branch development and switch to another one (wip)
  147. # When you want to go back to work, just unwip it
  148. #
  149. # This function return a warning if the current branch is a wip
  150. function work_in_progress() {
  151. if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
  152. echo "WIP!!"
  153. fi
  154. }
  155. # these alias commit and uncomit wip branches
  156. alias gwip='git add -A; git ls-files --deleted -z | xargs -r0 git rm; git commit -m "--wip--"'
  157. alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
  158. # these alias ignore changes to file
  159. alias gignore='git update-index --assume-unchanged'
  160. alias gunignore='git update-index --no-assume-unchanged'
  161. # list temporarily ignored files
  162. alias gignored='git ls-files -v | grep "^[[:lower:]]"'