linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-13 03:01:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor changes in Git aliases

Browse source 
- change gr to git remote to git rebase. In a daily developement,
  for a typical developper, ther is more rebase than adding or
  removing branches. Thus, gr (for git remote) becomes gre, while
  gr becomes git rebase (gr = rebase, gra = abort rebase,
  grc = rebase continue)
- gf is for git fetch. new alias for --all: gfa
- gitk-entier-history is a magic alias for find lost/dandling
  commits without having to mess with git reflog

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
This commit is contained in:
Gaetan Semet 2013-09-10 11:15:53 +02:00
commit 00f52bcc1b
1 changed files with 59 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

82
plugins/git/git.plugin.zsh
View file

@ -8,18 +8,27 @@ compdef _git gd=git-diff
alias gl='git pull'
compdef _git gl=git-pull
alias gup='git pull --rebase'
compdef _git gup=git-fetch
compdef _git gup=git-pull
alias gpr='git pull --rebase'
compdef _git gpr=git-pull
alias gp='git push'
compdef _git gp=git-push
alias gd='git diff'
alias gf='git fetch'
compdef _git gf='git-fetch'
alias gfa='git fetch --all'
compdef _git gfa='git-fetch'
alias gd='git diff --color'
compdef _git gd=git-diff
gdv() { git diff -w "$@" | view - }
compdef _git gdv=git-diff
alias gdc='git diff --cached'
compdef _git gdc=git-diff
alias gc='git commit -v'
compdef _git gc=git-commit
alias gc!='git commit -v --amend'
compdef _git gc!=git-commit
alias gca='git commit -v -a'
compdef _git gc=git-commit
compdef _git gca=git-commit
alias gca!='git commit -v -a --amend'
compdef _git gca!=git-commit
alias gcmsg='git commit -m'
@ -27,24 +36,27 @@ compdef _git gcmsg=git-commit
alias gco='git checkout'
compdef _git gco=git-checkout
alias gcm='git checkout master'
alias gr='git remote'
compdef _git gr=git-remote
alias grv='git remote -v'
compdef _git gcm=git-checkout
alias grm='git rebase master'
compdef _git grm=git-rebase
alias gre='git remote'
compdef _git gre=git-remote
alias grev='git remote -v'
compdef _git grv=git-remote
alias grmv='git remote rename'
compdef _git grmv=git-remote
alias grrm='git remote remove'
alias gremv='git remote rename'
compdef _git gremv=git-remote
alias grerm='git remote remove'
compdef _git grrm=git-remote
alias grset='git remote set-url'
compdef _git grset=git-remote
alias grup='git remote update'
compdef _git grset=git-remote
alias grbi='git rebase -i'
compdef _git grbi=git-rebase
alias grbc='git rebase --continue'
compdef _git grbc=git-rebase
alias grba='git rebase --abort'
compdef _git grba=git-rebase
alias greset='git remote set-url'
compdef _git greset=git-remote
alias greup='git remote update'
compdef _git greset=git-remote
alias gr='git rebase -i'
compdef _git gr=git-rebase
alias grc='git rebase --continue'
compdef _git grc=git-rebase
alias gra='git rebase --abort'
compdef _git gra=git-rebase
alias gb='git branch'
compdef _git gb=git-branch
alias gba='git branch -a'
@ -52,11 +64,14 @@ compdef _git gba=git-branch
alias gcount='git shortlog -sn'
compdef gcount=git
alias gcl='git config --list'
compdef _git gcl=git-config
alias gcp='git cherry-pick'
compdef _git gcp=git-cherry-pick
alias glg='git log --stat --max-count=5'
alias glg='git log --stat --max-count=5 --color'
compdef _git glg=git-log
alias glgg='git log --graph --max-count=5'
alias glgp='git log --stat --color -p'
compdef _git glgp=git-log
alias glgg='git log --graph --color'
compdef _git glgg=git-log
alias glgga='git log --graph --decorate --all'
compdef _git glgga=git-log
@ -69,18 +84,36 @@ compdef _git ga=git-add
alias gm='git merge'
compdef _git gm=git-merge
alias grh='git reset HEAD'
compdef _git grh=git-reset
alias grhh='git reset HEAD --hard'
alias gclean='git reset --hard && git clean -dfx'
compdef _git grhh=git-reset
alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
compdef _git gwc=git-whatchanged
alias gf='git ls-files | grep'
compdef _git gf=git-ls-files
alias gls='git ls-files | grep'
compdef _git gls=git-ls-files
alias gpoat='git push origin --all && git push origin --tags'
compdef _git gpoat=git-push
alias gmt='git mergetool --no-prompt'
compdef _git gm=git-mergetool
compdef _git gmt=git-mergetool
alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
compdef _git gmtvim=git-mergetool
alias gg='git gui citool'
compdef _git gg='git gui'
alias gga='git gui citool --amend'
compdef _git gga='git gui citool --amend'
alias gk='gitk --all --branches'
compdef _git gk='gitk'
alias gsts='git stash show --text'
compdef _git gsts='git-stash'
alias gitk-entier-history='gitk --all $(git log -g --pretty=format:%h)' # show complete history, with dangling commits
compdef _git gitk='gitk'
# Note: if the commit has been cleaned my 'git gc', the dangling commits older than 2 weeks may have been deleted
#
alias gitconfig="vim ~/.gitconfig"
alias gitmessage="vim ~/.gitmessage"
# Will cd into the top of the current repository
# or submodule.
@ -91,7 +124,10 @@ alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
compdef git-svn-dcommit-push=git
alias gsr='git svn rebase'
compdef _git gsr='git-svn'
alias gsd='git svn dcommit'
compdef _git gsd='git-svn'
#
# Will return the current branch name
# Usage example: git pull origin $(current_branch)