3072a2093e199a073c8e51672a1c01ee2d6bf0ef

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #1916 from okuramasafumi/master

Change duplicated alias name

Diff

 1diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
 2index 851fdf24bf283b50189ebe16e154bd0fff9901ef..2ecc74eb635f2dd342c819dc2d3b53aeb50a8147 100644
 3--- a/plugins/git/git.plugin.zsh
 4+++ b/plugins/git/git.plugin.zsh
 5@@ -78,7 +78,7 @@ compdef _git gm=git-mergetool
 6 alias gg='git gui citool'
 7 alias gga='git gui citool --amend'
 8 alias gk='gitk --all --branches'
 9-alias gss='git stash show --text'
10+alias gsts='git stash show --text'
11 
12 # Will cd into the top of the current repository
13 # or submodule.