# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1326731293 18000
# Node ID 029fa7773f34f5af94f3c656105d30caa2f0a6ce
# Parent  824dfcda2807ead9c88e6f1da8bb4eab96cf4407
Moar.

diff -r 824dfcda2807 -r 029fa7773f34 .gitconfig
--- a/.gitconfig	Fri Jan 13 10:23:32 2012 -0500
+++ b/.gitconfig	Mon Jan 16 11:28:13 2012 -0500
@@ -26,11 +26,13 @@
     unstage = reset HEAD
     uns = reset HEAD
 
+    currentbranch = !git branch --contains HEAD | tr -s ' ' | cut -d ' ' -f2
     fo = fetch origin
     fu = fetch upstream
     po = push origin
     lo = pull origin
-    mo = !git merge origin/`git branch --contains HEAD | tr -s ' ' | cut -d ' ' -f2`
+    mo = !git merge --no-ff origin/`git currentbranch`
+    uo = !git merge --ff-only origin/`git currentbranch`
 
 [push]
 	default = current
diff -r 824dfcda2807 -r 029fa7773f34 .hgsubstate
--- a/.hgsubstate	Fri Jan 13 10:23:32 2012 -0500
+++ b/.hgsubstate	Mon Jan 16 11:28:13 2012 -0500
@@ -2,7 +2,7 @@
 c060c94622e92e091b2c67499fdda16d91b68c01 mercurial/templates
 d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
 a41d5d52c39a31128e969e69acf800b198cb07f9 vim/bundle/ack
-bf03741650aae253b9fbfdb5526d6a7b818a060d vim/bundle/ctrlp
+420174fc537ba986a716964db7af0bd189252944 vim/bundle/ctrlp
 cdecdc56f938840cad250aecd58c1901f04c4d1b vim/bundle/easymotion
 b4b75ef682da3e946c648d3634ade39d0af49aba vim/bundle/fugitive
 2a78f151df54b53874f0aa6a85cfdad6ead224ed vim/bundle/gundo
diff -r 824dfcda2807 -r 029fa7773f34 vim/.vimrc
--- a/vim/.vimrc	Fri Jan 13 10:23:32 2012 -0500
+++ b/vim/.vimrc	Mon Jan 16 11:28:13 2012 -0500
@@ -51,6 +51,15 @@
 set linebreak
 set dictionary=/usr/share/dict/words
 
+" Make Vim able to edit crontab files again.
+set backupskip=/tmp/*,/private/tmp/*" 
+
+" Save when losing focus
+au FocusLost * :wa
+
+" Resize splits when the window is resized
+au VimResized * exe "normal! \<c-w>="
+
 " Wildmenu completion {{{
 
 set wildmenu
@@ -76,16 +85,6 @@
 set wildignore+=lib
 
 " }}}
-
-" Make Vim able to edit crontab files again.
-set backupskip=/tmp/*,/private/tmp/*" 
-
-" Save when losing focus
-au FocusLost * :wa
-
-" Resize splits when the window is resized
-au VimResized * exe "normal! \<c-w>="
-
 " Line Return {{{
 
 " Make sure Vim returns to the same line when you reopen a file.
@@ -711,6 +710,7 @@
 " Send visual selection to gist.github.com as a private, filetyped Gist
 " Requires the gist command line too (brew install gist)
 vnoremap <leader>G :w !gist -p -t %:e \| pbcopy<cr>
+vnoremap <leader>UG :w !gist -p \| pbcopy<cr>
 
 " Change case
 nnoremap <C-u> gUiw
@@ -883,11 +883,15 @@
 " }}}
 " Ctrl-P {{{
 
+let g:ctrlp_dont_split = 'NERD_tree_2'
+let g:ctrlp_jump_to_buffer = 0
 let g:ctrlp_map = '<leader>,'
 let g:ctrlp_working_path_mode = 0
 let g:ctrlp_match_window_reversed = 1
 let g:ctrlp_split_window = 0
 let g:ctrlp_max_height = 20
+let g:ctrlp_extensions = ['tag']
+
 let g:ctrlp_prompt_mappings = {
 \ 'PrtSelectMove("j")':   ['<c-j>', '<down>', '<s-tab>'],
 \ 'PrtSelectMove("k")':   ['<c-k>', '<up>', '<tab>'],
@@ -895,7 +899,16 @@
 \ 'PrtHistory(1)':        ['<c-p>'],
 \ 'ToggleFocus()':        ['<c-tab>'],
 \ }
-let g:ctrlp_extensions = ['tag']
+
+let my_ctrlp_user_command = "" . 
+    \ "find %s '(' -type f -or -type l ')' -maxdepth 15 -not -path '*/\\.*/*' | " .
+    \ "egrep -iv '\\.(" .
+    \ "swp|swo|log|so|o|pyc|jpe?g|png|gif|mo|po" .
+    \ ")$' | " .
+    \ "egrep -v '^\\./(" .
+    \ "libs/|deploy/vendor/|.git/|.hg/|.svn/|.*migrations/" . 
+    \ ")'"
+let g:ctrlp_user_command = ['.git/', 'cd %s && git ls-files', my_ctrlp_user_command]
 
 nnoremap <leader>. :CtrlPTag<cr>
 
@@ -986,7 +999,7 @@
 au Filetype nerdtree setlocal nolist
 
 let NERDTreeHighlightCursorline=1
-let NERDTreeIgnore=['.vim$', '\~$', '.*\.pyc$', 'pip-log\.txt$', 'whoosh_index', 'xapian_index', '.*.pid', 'monitor.py', '.*-fixtures-.*.json', '.*\.o$', 'db.db']
+let NERDTreeIgnore = ['.vim$', '\~$', '.*\.pyc$', 'pip-log\.txt$', 'whoosh_index', 'xapian_index', '.*.pid', 'monitor.py', '.*-fixtures-.*.json', '.*\.o$', 'db.db', 'tags.bak']
 
 let NERDTreeMinimalUI = 1
 let NERDTreeDirArrows = 1
diff -r 824dfcda2807 -r 029fa7773f34 zsh/misc.zsh
--- a/zsh/misc.zsh	Fri Jan 13 10:23:32 2012 -0500
+++ b/zsh/misc.zsh	Mon Jan 16 11:28:13 2012 -0500
@@ -90,7 +90,23 @@
 alias collapse="sed -e 's/  */ /g'"
 alias cuts="cut -d' '"
 alias clc="./get-last-commit-url.py | pbc"
+alias count="sort | uniq -c | sort -n"
 
 function psg() {
     ps auxww | grep --color=always $* | grep -v grep | collapse | cuts -f 2,11-
 }
+
+# sudo launchctl load -w /System/Library/LaunchDaemons/com.apple.atrun.plist
+function gn() {
+    MINS=$1; shift
+
+    if [[ "x$MINS" == "x1" ]]; then
+        echo "one"
+        UNITS="minute"
+    else
+        echo "two"
+        UNITS="minutes"
+    fi
+
+    echo growlnotify -sm "'$*'" | at now + $MINS $UNITS
+}