Merge commit 'origin/master' into next

[people/teissler/ipfire-2.x.git] / config / etc / bashrc

diff --git a/config/etc/bashrc b/config/etc/bashrc
index 210188d7a224846ad5ba9778ab685325d406412c..e35209f335ff37d689d61bd4156548a1183650bc 100644 (file)
--- a/config/etc/bashrc
+++ b/config/etc/bashrc
@@ -20,6 +20,14 @@ fi
 # /etc/profile.
 
 alias ls='ls --color=auto'
+alias ll='ls -la'
+alias which='alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde'
+
+# Make the shell a little bit more interactive 
+# to prevent the deletion of some files
+alias mv='mv -i'
+alias rm='rm -i'
+alias cp='cp -i'
 
 # Midnight Commander isn't compatible to UTF8.
 # So we use it in ACSII-Mode.