aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.aliases6
1 files changed, 4 insertions, 2 deletions
diff --git a/.aliases b/.aliases
index c28f4c6..98cc029 100644
--- a/.aliases
+++ b/.aliases
@@ -8,10 +8,12 @@ alias grep='grep --color=auto'
alias emacs='emacs -nw'
alias magit='et -e "(magit-status \"$(pwd)\")"'
alias agenda='et -e "(org-agenda nil \" \")"'
-alias nb='cd ~/journals; vim index.md; cd -'
-alias todo='cd ~/journals; vim gtd.md; cd -'
alias vimg='vim +Git +only'
+# Don't save command history
+command -v todo.sh > /dev/null && alias t=' todo.sh'
+command -v jrnl > /dev/null && alias jrnl=' jrnl'
+
alias gmf='git diff --merge-base'
alias gmfn='git diff --merge-base --name-only'