X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Faliases.in;h=cb59d9c4fc3953ba3595930c93702099b3be0600;hb=d80ef8ee3f9d24ae0a17ec15eaf6137ab7781b7f;hp=06d7277bc0e4627c7197747e5da1c8507cb2beed;hpb=843ce28bcb3395a862bdb8fef45203b284364e3c;p=config%2Fdotfiles.git

diff --git a/shell/aliases.in b/shell/aliases.in
index 06d7277..cb59d9c 100644
--- a/shell/aliases.in
+++ b/shell/aliases.in
@@ -31,6 +31,7 @@ alias t=tig
 alias v=vim
 alias x=exit
 # Shortcuts for a little less used programs.
+alias ga='git annex'
 alias gr=grep
 alias gri='grep -i'
 alias grr='grep -r'
@@ -38,6 +39,7 @@ alias grri='grep -ri'
 alias mc='make clean'
 alias mj='make -j'
 alias mu=mutt
+alias rs=reset # like git's reset alias
 alias sa='ssh-add -t 1h'
 alias te=tree
 # systemd ... (sc is provided as shell script for better completoin)
@@ -69,7 +71,7 @@ unalias ls 2>/dev/null
 # See `setup.sh` for details. LS_* are replaced with the appropriate values
 # when this file is generated.
 ls() {
-    LS_ENV command ls LS_COLOR LS_OPTIONS -C -F "$@" 2>&1 | less
+    LS_ARGS -C -F "$@" 2>&1 | less
 }
 
 unalias ll lt la lal lat 2>/dev/null
@@ -118,4 +120,14 @@ info() {
     command info "$@" 2>/dev/null | less
 }
 
+# Using su (or sudo) as root to a less privileged user might allow the other
+# user to run arbitrary commands as root. See also Debian bugs #628843 and
+# #657784.
+if test "`id -u`" -eq 0; then
+    su() {
+        echo 'never su as root' >&2
+        return 1
+    }
+fi
+
 # vim: ft=sh