1. 在 ~/.bashrc 中引入其他脚本文件
  1. # plugin
  2. source ~/bash_plugin/git.plugin.sh
  1. fork 自 on-my-bash 的 git 插件
  1. #!/usr/bin/env bash
  2. #
  3. # Functions
  4. #
  6. # The name of the current branch
  7. # Back-compatibility wrapper for when this function was defined here in
  8. # the plugin, before being pulled in to core lib/git.zsh as git_current_branch()
  9. # to fix the core -> git plugin dependency.
  10. function current_branch() {
  11.   git_current_branch
  12. }
  13. # The list of remotes
  14. function current_repository() {
  15.   if ! $_omb_git_git_cmd rev-parse --is-inside-work-tree &> /dev/null; then
  16.     return
  17.   fi
  18.   echo $($_omb_git_git_cmd remote -v | cut -d':' -f 2)
  19. }
  20. # Pretty log messages
  21. function _git_log_prettily(){
  22.   if ! [ -z $1 ]; then
  23.     git log --pretty=$1
  24.   fi
  25. }
  26. # Warn if the current branch is a WIP
  27. function work_in_progress() {
  28.   if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
  29.     echo "WIP!!"
  30.   fi
  31. }
  33. #
  34. # Aliases
  35. # (sorted alphabetically)
  36. #
  38. alias g='git'
  40. alias ga='git add'
  41. alias gaa='git add --all'
  42. alias gapa='git add --patch'
  43. alias gau='git add --update'
  45. alias gb='git branch'
  46. alias gba='git branch -a'
  47. alias gbd='git branch -d'
  48. alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d'
  49. alias gbl='git blame -b -w'
  50. alias gbnm='git branch --no-merged'
  51. alias gbr='git branch --remote'
  52. alias gbs='git bisect'
  53. alias gbsb='git bisect bad'
  54. alias gbsg='git bisect good'
  55. alias gbsr='git bisect reset'
  56. alias gbss='git bisect start'
  58. alias gc='git commit -v'
  59. alias gc!='git commit -v --amend'
  60. alias gcn!='git commit -v --no-edit --amend'
  61. alias gca='git commit -v -a'
  62. alias gca!='git commit -v -a --amend'
  63. alias gcan!='git commit -v -a --no-edit --amend'
  64. alias gcans!='git commit -v -a -s --no-edit --amend'
  65. alias gcam='git commit -a -m'
  66. alias gcsm='git commit -s -m'
  67. alias gcb='git checkout -b'
  68. alias gcf='git config --list'
  69. alias gcl='git clone --recursive'
  70. alias gclean='git clean -fd'
  71. alias gpristine='git reset --hard && git clean -dfx'
  72. alias gcm='git checkout master'
  73. alias gcd='git checkout develop'
  74. alias gcmsg='git commit -m'
  75. alias gco='git checkout'
  76. alias gcount='git shortlog -sn'
  77. #compdef _git gcount complete -F _git gcount
  78. alias gcp='git cherry-pick'
  79. alias gcpa='git cherry-pick --abort'
  80. alias gcpc='git cherry-pick --continue'
  81. alias gcps='git cherry-pick -s'
  82. alias gcs='git commit -S'
  84. alias gd='git diff'
  85. alias gdca='git diff --cached'
  86. alias gdct='git describe --tags `git rev-list --tags --max-count=1`'
  87. alias gdt='git diff-tree --no-commit-id --name-only -r'
  88. alias gdw='git diff --word-diff'
  90. gdv() {
  91.   git diff -w "$@" | view -
  92. }
  93. #compdef _git gdv=git-diff
  95. alias gf='git fetch'
  96. alias gfa='git fetch --all --prune'
  97. alias gfo='git fetch origin'
  99. gfg() {
  100.   git ls-files | grep "$@"
  101. }
  102. #compdef _grep gfg
  104. alias gg='git gui citool'
  105. alias gga='git gui citool --amend'
  107. ggf() {
  108.   [[ "$#" != 1 ]] && local b="$(git_current_branch)"
  109.   git push --force origin "${b:=$1}"
  110. }
  111. #compdef _git ggf=git-checkout
  113. ggl() {
  114.   if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
  115.     git pull origin "${*}"
  116.   else
  117.     [[ "$#" == 0 ]] && local b="$(git_current_branch)"
  118.     git pull origin "${b:=$1}"
  119.   fi
  120. }
  121. #compdef _git ggl=git-checkout
  123. ggp() {
  124.   if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
  125.     git push origin "${*}"
  126.   else
  127.     [[ "$#" == 0 ]] && local b="$(git_current_branch)"
  128.     git push origin "${b:=$1}"
  129.   fi
  130. }
  131. #compdef _git ggp=git-checkout
  133. ggpnp() {
  134.   if [[ "$#" == 0 ]]; then
  135.     ggl && ggp
  136.   else
  137.     ggl "${*}" && ggp "${*}"
  138.   fi
  139. }
  140. #compdef _git ggpnp=git-checkout
  142. ggu() {
  143.   [[ "$#" != 1 ]] && local b="$(git_current_branch)"
  144.   git pull --rebase origin "${b:=$1}"
  145. }
  146. #compdef _git ggu=git-checkout
  148. alias ggpur='ggu'
  149. #compdef _git ggpur=git-checkout
  151. alias ggpull='git pull origin $(git_current_branch)'
  152. #compdef _git ggpull=git-checkout
  154. alias ggpush='git push origin $(git_current_branch)'
  155. #compdef _git ggpush=git-checkout
  157. alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
  158. alias gpsup='git push --set-upstream origin $(git_current_branch)'
  160. alias ghh='git help'
  162. alias gignore='git update-index --assume-unchanged'
  163. alias gignored='git ls-files -v | grep "^[[:lower:]]"'
  164. alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
  165. #compdef _git git-svn-dcommit-push=git
  167. alias gk='\gitk --all --branches'
  168. #compdef _git gk='gitk'
  169. alias gke='\gitk --all $(git log -g --pretty=%h)'
  170. #compdef _git gke='gitk'
  172. alias gl='git pull'
  173. alias glg='git log --stat'
  174. alias glgp='git log --stat -p'
  175. alias glgg='git log --graph'
  176. alias glgga='git log --graph --decorate --all'
  177. alias glgm='git log --graph --max-count=10'
  178. alias glo='git log --oneline --decorate'
  179. alias glol="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
  180. alias glola="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all"
  181. alias glog='git log --oneline --decorate --graph'
  182. alias gloga='git log --oneline --decorate --graph --all'
  183. alias glp="_git_log_prettily"
  184. #compdef _git glp=git-log
  186. alias gm='git merge'
  187. alias gmom='git merge origin/master'
  188. alias gmt='git mergetool --no-prompt'
  189. alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
  190. alias gmum='git merge upstream/master'
  192. alias gp='git push'
  193. alias gpd='git push --dry-run'
  194. alias gpoat='git push origin --all && git push origin --tags'
  195. #compdef _git gpoat=git-push
  196. alias gpu='git push upstream'
  197. alias gpv='git push -v'
  199. alias gr='git remote'
  200. alias gra='git remote add'
  201. alias grb='git rebase'
  202. alias grba='git rebase --abort'
  203. alias grbc='git rebase --continue'
  204. alias grbi='git rebase -i'
  205. alias grbm='git rebase master'
  206. alias grbs='git rebase --skip'
  207. alias grh='git reset HEAD'
  208. alias grhh='git reset HEAD --hard'
  209. alias grmv='git remote rename'
  210. alias grrm='git remote remove'
  211. alias grset='git remote set-url'
  212. alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
  213. alias gru='git reset --'
  214. alias grup='git remote update'
  215. alias grv='git remote -v'
  217. alias gsb='git status -sb'
  218. alias gsd='git svn dcommit'
  219. alias gsi='git submodule init'
  220. alias gsps='git show --pretty=short --show-signature'
  221. alias gsr='git svn rebase'
  222. alias gss='git status -s'
  223. alias gst='git status'
  224. alias gsta='git stash save'
  225. alias gstaa='git stash apply'
  226. alias gstc='git stash clear'
  227. alias gstd='git stash drop'
  228. alias gstl='git stash list'
  229. alias gstp='git stash pop'
  230. alias gsts='git stash show --text'
  231. alias gsu='git submodule update'
  233. alias gts='git tag -s'
  234. alias gtv='git tag | sort -V'
  236. alias gunignore='git update-index --no-assume-unchanged'
  237. alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
  238. alias gup='git pull --rebase'
  239. alias gupv='git pull --rebase -v'
  240. alias glum='git pull upstream master'
  242. alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
  243. alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify -m "--wip-- [skip ci]"'

  1. 愉快使用 gaa gcmsg gco gl gp 等快捷命令吧

    Reference

  2. oh-my-bash

  3. Oh My Zsh
  4. Oh My Zsh Plugins