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

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	plugins/git/git.plugin.zsh
This commit is contained in:
Gaetan Semet 2013-07-01 11:01:16 +02:00
commit f7b2afc1b7
5 changed files with 146 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,8 +102,8 @@ alias gga='git gui citool --amend'
compdef _git gga='git gui citool --amend'
alias gk='gitk --all --branches'
compdef _git gk='gitk'
alias gss='git stash show --text'
compdef _git gss='git stash show'
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