Merge branch 'master' into develop

1 files changed, 16 insertions, 3 deletions

diff --git a/core/conf/skel/.bashrc b/core/conf/skel/.bashrc
index 9a7498e..88cf24c 100644
--- a/core/conf/skel/.bashrc
+++ b/core/conf/skel/.bashrc
@@ -29,6 +29,7 @@ alias mv='mv -i'
 alias mkdir='mkdir -p'
 
 alias h='history'
+alias hg='history | grep'
 alias j='jobs -l'
 alias which='type -a'
 alias ..='cd ..'
@@ -40,13 +41,25 @@ genpasswd () {
     tr -dc A-Za-z0-9_ < /dev/urandom | head -c ${l} | xargs
 }
 
-# Git graph log
+# Git log
 glog () {
+    git log --stat --decorate
+}
+# Git graph log
+gloga () {
     git log --graph --abbrev-commit --decorate --date=relative --all
 }
 
+alias tmux="tmux -2"
+
+# Virtual Crux machine
+alias c1.ank="ssh c1.ank -t tmux a"
+alias c2.ank="ssh c2.ank -t tmux a"
+alias c9.ank="ssh c9.ank -t tmux a"
+
+alias pkg_mirror="pkg_bin -f /usr/ports/mirror_bin_db"
+alias pkg_update="pkg_bin -r /usr/ports/mirror_bin_db"
 
-#alias tmux="tmux -2"
 #if [[ -z "$TMUX" ]] ;then
 #    ID="`tmux ls | grep -vm1 attached | cut -d: -f1`" # get the id of a deattached session
 #    if [[ -z "$ID" ]] ;then # if not available create a new one
@@ -55,4 +68,4 @@ glog () {
 #        tmux attach-session -t "$ID" # if available attach to it
 #    fi
 #fi
-#
+MAIL=/home/silvino/.mail/