aboutsummaryrefslogtreecommitdiff
path: root/.alias.d
diff options
context:
space:
mode:
Diffstat (limited to '.alias.d')
-rw-r--r--.alias.d/00-general13
1 files changed, 6 insertions, 7 deletions
diff --git a/.alias.d/00-general b/.alias.d/00-general
index 2b13b55..bfd4a8e 100644
--- a/.alias.d/00-general
+++ b/.alias.d/00-general
@@ -1,18 +1,17 @@
# aliases
alias grep='grep --color'
-alias ec="$EDITOR"
alias psc='ps xawf -eo pid,user,cgroup,args'
-alias gcm='git checkout master && git fetch upstream && git reset --hard upstream/master && git push'
+alias gcm='git checkout master && git fetch upstream && git reset --hard upstream/master && git push origin master'
alias df='df -h -x none'
alias free='free -m'
alias c='cd; clear'
+
alias ls='ls -b -CF --color=auto'
-alias l=ls
-alias ll='ls -lS'
-alias dir='ls -lha'
+alias l='ls -l'
+alias la='ls -laS'
+
alias du='du -h'
-alias cal='cal -3'
-alias edit=$EDITOR
+alias cal='cal -y'
alias e=$EDITOR
alias mtr='mtr --curses'
nihil fit ex nihilo