8122243b81da
More.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Fri, 22 Jul 2011 10:31:50 -0400 |
parents | dbda09a75160 |
children | c210796f4368 |
branches/tags | (none) |
files | .ackrc .hgrc vim/.vimrc |
Changes
--- a/.ackrc Fri Jul 15 10:04:21 2011 -0400 +++ b/.ackrc Fri Jul 22 10:31:50 2011 -0400 @@ -8,4 +8,8 @@ --type-set vim=.vim --type-set -front=.html,.js,.less,.css +fe=.html,.js,.less +--type-set +fea=.html,.js,.less,.css +--ignore-dir=public/media/cache +--ignore-dir=public/static/cache
--- a/.hgrc Fri Jul 15 10:04:21 2011 -0400 +++ b/.hgrc Fri Jul 22 10:31:50 2011 -0400 @@ -224,6 +224,9 @@ subs = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | xargs -n1 -I SUB $HG -R "`$HG root`/SUB" $@ psubs = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | parallel -j10 -I SUB $HG -R "`$HG root`/SUB" $@ +subscmd = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | xargs -n1 -I SUB sh -c "cd `$HG root`/SUB && $@" +psubscmd = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | parallel -j10 -I SUB sh -c "cd `$HG root`/SUB && $@" + # Run a command on a subrepo: # # hg sub SUBREPO_REGEX ...command and arguments... @@ -240,3 +243,5 @@ # $ hg sub ar status -m # M lol.py sub = !grep = "`$HG root`/.hgsub" | cut -d' ' -f1 | grep "$1" | tr -d '\n ' | xargs -0 -I SUB $HG -R SUB $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 $17 $18 $19 $20 + +md = merge default
--- a/vim/.vimrc Fri Jul 15 10:04:21 2011 -0400 +++ b/vim/.vimrc Fri Jul 22 10:31:50 2011 -0400 @@ -690,12 +690,12 @@ let g:threesome_initial_mode = "grid" -let g:threesome_initial_layout_grid = 0 +let g:threesome_initial_layout_grid = 1 let g:threesome_initial_layout_loupe = 0 let g:threesome_initial_layout_compare = 0 let g:threesome_initial_layout_path = 0 -let g:threesome_initial_diff_grid = 0 +let g:threesome_initial_diff_grid = 1 let g:threesome_initial_diff_loupe = 0 let g:threesome_initial_diff_compare = 0 let g:threesome_initial_diff_path = 0