summaryrefslogtreecommitdiff
path: root/.bash_aliases
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-04-11 23:01:21 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-04-11 23:01:21 -0400
commit6c0a5af3aba9902206a73a62e2be2e4dd67be9da (patch)
treecbc0dbb938716a80cc0248b5aff97dc34f21c756 /.bash_aliases
parentebc4f813d517d44ddf7440fd8043c5d41adf8932 (diff)
parenta96ee608ce4be813ce381a6a0c195591f633986e (diff)
Merge branch 'hp-dv6426us-par' into identica-mode-1.2hp-dv6426us-par/identica-mode-1.2
Conflicts: .emacs
Diffstat (limited to '.bash_aliases')
-rw-r--r--.bash_aliases6
1 files changed, 4 insertions, 2 deletions
diff --git a/.bash_aliases b/.bash_aliases
index 0788501..de1a321 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -1,6 +1,6 @@
#!/bin/bash
# The above line probably should never be *used* in this file, but it
-# lets editors know that this is BASH syntax.
+# lets text editors know that this is BASH syntax.
######################################################################
# Set up colors and settings for ls/dir/vdir #
@@ -39,6 +39,8 @@ alias l='ls -CF'
alias ssh='ssh -XC'
alias sed='sed --follow-symlinks'
alias tree='tree --charset utf8'
+alias cd=pushd
+alias gitk='gitk --all --date-order'
######################################################################
# Remember lat/long for redshift #
@@ -52,7 +54,7 @@ alias redshift="$redshift"
######################################################################
#alias serva='ssh luke@servb.ath.cx -p3440'
#alias phpdoctor='php /usr/gnu/www/0-other/phpdoctor-head/phpdoc.php'
-function xterm-title () { echo "];$@"; } # Oh, wait this one is
+function xterm-title () { echo "];$@"; } # Oh, wait this one *is* a function
alias lock="clear; away -C 'This terminal is locked'"
alias plock="xterm-title Terminal Locked;lock"