"Expand" all alias definitions

This makes it more obvious, what the alias is about, and makes the the
"olets/zsh-abbr" extension more useful, for example.

diff --git a/default_plugins/std_aliases/std_aliases.zshrc b/default_plugins/std_aliases/std_aliases.zshrc
index feef861bc39461c479a538b748147dffccbdb514..9ef61c60a949dd3b8fbf25b425e0b622e144db7c 100644 (file)
--- a/default_plugins/std_aliases/std_aliases.zshrc
+++ b/default_plugins/std_aliases/std_aliases.zshrc
@@ -2,8 +2,8 @@
 # std_aliases: Setup standard aliases
 
 alias ll="ls -hl"
-alias l="ll -a"
-alias la="ll -A"
+alias l="ls -ahl"
+alias la="ls -Ahl"
 alias lx="ls -A"
 
 alias lasth='last -aw | head -n "$((LINES-1))"'

diff --git a/plugins/git/git.zshrc b/plugins/git/git.zshrc
index 5073cc5e30f7c7b54cf1b6302381377b6e5e74a3..d9fa8904c1a9b57da1dc8ee3eeb34d92602c0de8 100644 (file)
--- a/plugins/git/git.zshrc
+++ b/plugins/git/git.zshrc
@@ -59,35 +59,35 @@ alias parse_git_dirty=git_parse_dirty
 
 axzsh_vcs_prompt_functions=($axzsh_vcs_prompt_functions git_prompt)
 
-alias fix="gd --name-only | uniq | xargs $EDITOR"
+alias fix="git diff --name-only | uniq | xargs $EDITOR"
 alias g="git"
-alias ga="g add"
-alias gapa="ga --patch"
-alias gc="g commit --verbose"
-alias gc!="gc --amend"
-alias gca="gc --all"
-alias gcam="gca --message"
-alias gcmsg="gc --message"
-alias gcn="gc --no-edit"
-alias gcn!="gcn --amend"
-alias gco="g checkout"
-alias gd="g diff"
-alias gdca="gd --cached"
-alias gdcw="gdca --word-diff"
-alias gdw="gd --word-diff"
-alias gf="g fetch"
-alias gfa="gf --all --prune"
-alias gfo="gf origin"
-alias gl="g pull"
-alias glo="g log --oneline --decorate"
-alias gp="g push"
-alias gr="g remote"
-alias grb="g rebase"
-alias grbi="grb --interactive"
-alias gsb="gss --branch"
-alias gsh="g show"
-alias gss="gst --short"
-alias gst="g status"
-alias gsta="g stash"
-alias gstl="gsta list"
-alias gstp="gsta pop"
+alias ga="git add"
+alias gapa="git add --patch"
+alias gc="git commit --verbose"
+alias gc!="git commit --verbose --amend"
+alias gca="git commit --verbose --all"
+alias gcam="git commit --verbose --all --message"
+alias gcmsg="git commit --verbose --message"
+alias gcn="git commit --verbose --no-edit"
+alias gcn!="git commit --verbose --no-edit --amend"
+alias gco="git checkout"
+alias gd="git diff"
+alias gdca="git diff --cached"
+alias gdcw="git diff --cached --word-diff"
+alias gdw="git diff --word-diff"
+alias gf="git fetch"
+alias gfa="git fetch --all --prune"
+alias gfo="git fetch origin"
+alias gl="git pull"
+alias glo="git log --oneline --decorate"
+alias gp="git push"
+alias gr="git remote"
+alias grb="git rebase"
+alias grbi="git rebase --interactive"
+alias gsb="git status --short --branch"
+alias gsh="git show"
+alias gss="git status --short"
+alias gst="git status"
+alias gsta="git stash push"
+alias gstl="git stash list"
+alias gstp="git stash pop"