Merge remote-tracking branch 'origin/master'

home/user/.config/git/aliases

@@ -24,6 +24,7 @@
     ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)"
     pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)"
     pr = "pull --rebase"
+    s = status
     st = status
     br = branch
     bm = branch --merged
@@ -50,4 +51,4 @@
     aliases = "!git config -l | grep '^alias\\.' | cut -d. -f2-"
 
     # git clone git://localhost/
-    serve = daemon --verbose --export-all --base-path=.git --reuseaddr --strict-paths .git/
+    serve = daemon --verbose --export-all --base-path=.git --reuseaddr --strict-paths .git/

home/user/.config/zsh/aliases

@@ -76,16 +76,12 @@ alias vi='nvim'
 alias svi="sudo --preserve-env nvim"
 
 # git
-alias gs="git status"
+for al in s d di co col ds a u ps pl hs last lastd df amend br
-alias gd="git diff"
+do
-alias gds="git diff --staged"
+    alias "g${al}"="git ${al}"
-alias ga="git a"
+done
+
 alias gcim="noglob git cim"
-alias gps="git ps"
-alias ghs="git hs"
-alias glast="git last"
-alias glastd="git lastd"
-alias gdf="git df"
 
 # net
 alias ports='ss -tlnp'

install

@@ -254,4 +254,4 @@ case "${executed_command}" in
     help) shift;     cmd_help               "$@" ;;
     *) shift;        cmd_install "${executed_command}" "$@" ;;
 esac
-exit 0
+exit 0