From 35e08966414a3df10d905f1db905682ccfa589b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Benencia?= <raul@thousandeyes.com>
Date: Wed, 26 Jun 2019 12:49:14 -0700
Subject: Tweak general aliases

---
 .alias.d/00-general | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to '.alias.d')

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'
-- 
cgit v1.2.3