summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2013-06-28 12:48:38 -0700
committerRobby Russell <robby@planetargon.com>2013-06-28 12:48:38 -0700
commit3072a2093e199a073c8e51672a1c01ee2d6bf0ef (patch)
tree2751114685d956d3495a93df10bf9458d0b12efd /plugins
parentdb82b8e8d86d159a3aa7396c3543657fdd8a66db (diff)
parentc51ef9dce6a600976aa3d0a3d733bb99c477959b (diff)
downloadzsh-3072a2093e199a073c8e51672a1c01ee2d6bf0ef.tar.gz
zsh-3072a2093e199a073c8e51672a1c01ee2d6bf0ef.tar.bz2
zsh-3072a2093e199a073c8e51672a1c01ee2d6bf0ef.zip
Merge pull request #1916 from okuramasafumi/master
Change duplicated alias name
Diffstat (limited to 'plugins')
-rw-r--r--plugins/git/git.plugin.zsh2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 851fdf24b..2ecc74eb6 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -78,7 +78,7 @@ compdef _git gm=git-mergetool
alias gg='git gui citool'
alias gga='git gui citool --amend'
alias gk='gitk --all --branches'
-alias gss='git stash show --text'
+alias gsts='git stash show --text'
# Will cd into the top of the current repository
# or submodule.