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

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	README.textile
	lib/aliases.zsh
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
	themes/ys.zsh-theme
This commit is contained in:
Gaetan Semet 2015-04-22 18:22:55 +02:00
commit fdbecb80e3
91 changed files with 2617 additions and 598 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,6 +75,7 @@ compdef _git gss=git-status
alias ga='git add'
compdef _git ga=git-add
alias gap='git add --patch'
alias gaa='git add --all'
alias gm='git merge'
compdef _git gm=git-merge
alias grh='git reset HEAD'
@ -99,7 +100,7 @@ compdef _git gvt=git verify-tag
alias gpoat='git push origin --all && git push origin --tags'
alias gmt='git mergetool --no-prompt'
compdef _git gm=git-mergetool
compdef _git gmt=git-mergetool
alias gg='git gui citool'
alias gga='git gui citool --amend'
@ -175,5 +176,4 @@ alias gunignore='git update-index --no-assume-unchanged'
# list temporarily ignored files
alias gignored='git ls-files -v | grep "^[[:lower:]]"'
alias tiga='tig --all'
alias tiga='tig --all'