Merge with personal settings.
author |
Steve Losh <steve@stevelosh.com> |
date |
Mon, 01 Mar 2010 11:47:48 -0500 |
parents |
ed5d800d4a8a
(current diff)
c4483b80c572
(diff)
|
children |
c28dffabd937
|
branches/tags |
(none) |
files |
.hgrc .zshrc |
Changes
--- a/.hgrc Mon Mar 01 11:45:01 2010 -0500
+++ b/.hgrc Mon Mar 01 11:47:48 2010 -0500
@@ -102,7 +102,7 @@
i. = incoming -n --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.slog
sglog = glog --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.sglog
-, = sglog -l10
+, = sglog -l7
,, = , -l100000000
o, = outgoing --graph --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.sglog
i, = incoming --graph --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.sglog
@@ -110,3 +110,5 @@
nlog = log --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.nlog
n = nlog -vr
show = nlog --color=always -vpr
+
+qcm = qcommit -m
--- a/.zshrc Mon Mar 01 11:45:01 2010 -0500
+++ b/.zshrc Mon Mar 01 11:47:48 2010 -0500
@@ -27,6 +27,7 @@
export PATH="/usr/local/bin:/usr/local/sbin:$HOME/lib/fmscripts:$HOME/bin:$PATH"
export PATH="$HOME/.gem/ruby/1.8/bin:${PATH}"
export PATH="/opt/subversion/bin:${PATH}"
+export PATH="${PATH}:/usr/local/Cellar/PyPi/3.6/bin"
export WORKON_HOME="${HOME}/lib/virtualenvs"
export GREP_OPTIONS='--color=auto'
export HISTSIZE=1000
@@ -40,7 +41,7 @@
# Mercurial variables --------------------------------------------------------
export PATH="$HOME/lib/hg/hg-stable:$PATH"
-export PYTHONPATH="$HOME/lib/hg/hg-stable:$PYTHONPATH"
+export PYTHONPATH="$HOME/lib/hg/hg-stable:/usr/local/lib/python2.6/site-packages:$PYTHONPATH"
# Extra shell extensions like z and tab completion for Mercurial -------------
source ~/lib/z/z.sh