|
|
@@ -79,7 +79,6 @@ fi
|
|
|
alias ll='ls -alFh'
|
|
|
alias la='ls -A'
|
|
|
alias l='ls -CF'
|
|
|
-alias lsg='git ls-files'
|
|
|
|
|
|
# ssh shortcuts for multivac
|
|
|
alias smv='ssh mv -tt screen -Uxr'
|
|
|
@@ -96,6 +95,15 @@ alias v='gpicview'
|
|
|
alias avg="awk '{a+=\$1} END{print a/NR}'"
|
|
|
alias json='python -mjson.tool'
|
|
|
|
|
|
+# git shortcuts
|
|
|
+alias gs='git status'
|
|
|
+alias gd='git diff'
|
|
|
+alias ga='git add'
|
|
|
+alias gc='git commit'
|
|
|
+alias gp='git push'
|
|
|
+alias gr='git pull --rebase'
|
|
|
+alias m='make'
|
|
|
+
|
|
|
tm () {
|
|
|
`which time` -f %e $* > /dev/null
|
|
|
}
|
|
|
@@ -122,7 +130,7 @@ export LANG="$LC_ALL"
|
|
|
|
|
|
export EDITOR=vim
|
|
|
|
|
|
-export PATH=$HOME/.local/bin:$PATH
|
|
|
+export PATH=$HOME/.local/bin:$PATH:/sbin:/usr/sbin
|
|
|
|
|
|
#
|
|
|
# local, installation-specific config
|