From 75c0d49f5678b9d4f570385e522052962b995865 Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Fri, 3 May 2013 12:59:05 -0400 Subject: [PATCH] Swap aliases gsd and gsL --- modules/git/README.md | 5 ++--- modules/git/alias.zsh | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/git/README.md b/modules/git/README.md index 3fd6f6b7..1fa9a219 100644 --- a/modules/git/README.md +++ b/modules/git/README.md @@ -170,10 +170,9 @@ Aliases - `gsa` applies the changes recorded in a stash to the working directory. - `gsx` drops a stashed state. - `gsX` drops all the stashed states. - - `gsd` lists dropped stashed states. - `gsl` lists stashed states. - - `gsL` displays the changes recorded in the stash as a diff between the - stashed state and its original parent. + - `gsL` lists dropped stashed states. + - `gsd` displays changes between the stash and its original parent. - `gsp` removes and applies a single stashed state from the stash list. - `gsr` recovers a given stashed state. - `gss` stashes the changes of the dirty working directory, including untracked. diff --git a/modules/git/alias.zsh b/modules/git/alias.zsh index 09bb5a18..bf6d3644 100644 --- a/modules/git/alias.zsh +++ b/modules/git/alias.zsh @@ -147,9 +147,9 @@ alias gs='git stash' alias gsa='git stash apply' alias gsx='git stash drop' alias gsX='git-stash-clear-interactive' -alias gsd='git-stash-dropped' alias gsl='git stash list' -alias gsL='git stash show --patch --stat' +alias gsL='git-stash-dropped' +alias gsd='git stash show --patch --stat' alias gsp='git stash pop' alias gsr='git-stash-recover' alias gss='git stash save --include-untracked'