Merge in the changes I forgot to pull.
author |
Steve Losh <steve@stevelosh.com> |
date |
Tue, 23 Jun 2009 19:02:16 -0400 |
parents |
2e174ecf0ce1
(diff)
f0242d032ba3
(current diff)
|
children |
7903ea8c1103
|
branches/tags |
(none) |
files |
.hgrc |
Changes
--- a/.bashrc Sat Jun 20 17:20:47 2009 -0400
+++ b/.bashrc Tue Jun 23 19:02:16 2009 -0400
@@ -4,13 +4,24 @@
alias pm='python manage.py '
alias tunnel_webf_mysql='ssh -NL 3306/web45.webfaction.com/3306 webf'
+bind 'set completion-ignore-case on'
+bind 'set show-all-if-ambiguous on'
+bind 'set visible-stats on'
+
+shopt -s cdspell
+
# Environment variables ------------------------------------------------------
export EDITOR='vim'
export PATH="/usr/local/bin:${PATH}:/opt/local/bin"
export WORKON_HOME="${HOME}/lib/virtualenvs"
+export GREP_OPTIONS='--color=auto'
+export HISTSIZE=1000
+export HISTFILESIZE=1000
+export HISTCONTROL=erasedups
+export JPY="${HOME}/lib/j2/j.py"
# Extra shell extensions like j and tab completion for Mercurial -------------
-source ~/lib/j/j.sh
+source ~/lib/j2/j.sh
source ~/lib/hg/bash_completion
source ~/lib/virtualenvwrapper_bashrc
--- a/.hgrc Sat Jun 20 17:20:47 2009 -0400
+++ b/.hgrc Tue Jun 23 19:02:16 2009 -0400
@@ -16,6 +16,7 @@
hgshelve = ~/lib/hg/hgshelve/hgshelve.py
prompt = ~/src/hg-prompt/prompt.py
histedit = ~/lib/hg/histedit
+hg-git = ~/lib/hg/hg-git
[diff]
git = True