josh/files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'apu/master'

Browse Source
This commit is contained in:
Josh Holtrop 2011-12-15 19:57:38 -05:00
commit 1a1cac2e3f
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bash_aliases
View File

@ -110,6 +110,8 @@ function git-config-joshs()
git config --global alias.gdiff 'difftool -y -t gvimdiff' git config --global alias.gdiff 'difftool -y -t gvimdiff'
git config --global alias.gdiffc 'difftool -y -t gvimdiff --cached' git config --global alias.gdiffc 'difftool -y -t gvimdiff --cached'
git config --global alias.wdiff 'diff --word-diff=color' git config --global alias.wdiff 'diff --word-diff=color'
git config --global alias.mktar '!function f { name="$1"; pos="$2"; if [ "$pos" == "" ]; then pos=HEAD; fi; git archive --prefix="$name"/ "$pos" | bzip2 > ../"$name".tar.bz2; }; f'
git config --global push.default tracking
if [ -e /bin/cygwin1.dll ]; then if [ -e /bin/cygwin1.dll ]; then
git config --global alias.bcdiff 'difftool -y -t bc2' git config --global alias.bcdiff 'difftool -y -t bc2'
git config --global alias.bcdiffc 'difftool -y -t bc2 --cached' git config --global alias.bcdiffc 'difftool -y -t bc2 --cached'
@ -129,6 +131,14 @@ alias jindent='indent -bbo -bl -blf -bli0 -bls -i4 -npcs -nut -ts8'
# cygwin-specific aliases # cygwin-specific aliases
if [ -e /bin/cygwin1.dll ]; then if [ -e /bin/cygwin1.dll ]; then
alias ip="ipconfig | grep -E 'IP(v4)? Address' | sed -e 's/.*: //'" alias ip="ipconfig | grep -E 'IP(v4)? Address' | sed -e 's/.*: //'"
function cs
{
while [ "$1" != "" ]
do
cygstart "$1"
shift
done
}
fi fi
# source any machine-local aliases # source any machine-local aliases

29
vimrc Normal file → Executable file
View File

@ -51,6 +51,7 @@ set incsearch
set tags=./tags;/ set tags=./tags;/
let Tlist_WinWidth = 40 let Tlist_WinWidth = 40
set grepprg=internal set grepprg=internal
set tabpagemax=999
" GUI settings " GUI settings
set background=dark set background=dark
@ -78,9 +79,8 @@ end
" mappings " mappings
map ,# :set paste O75A#yypO#73A A#0ll:set nopaste R map ,# :set paste O75A#yypO#73A A#0ll:set nopaste R
map ,p :set paste o#73A A#0ll:set nopaste R map ,p :set paste o#73A A#0ll:set nopaste R
map ,* :set paste O/74A*o *72A A*o 73A*A/0klll:set nopaste R map ,* :set paste O/74A*o 73A*A/O * :set nopaste A
map ,; :set paste O;74A*o;*72A A*o;74A*0klll:set nopaste R map ,; :set paste O;74A*o;*72A A*o;74A*0klll:set nopaste R
map ,c :set paste o *72A A*0lll:set nopaste R
map ,8 :set paste o20A-A8<20A-:set nopaste 0 map ,8 :set paste o20A-A8<20A-:set nopaste 0
map ,m mz:%s/ //g :noh 'z map ,m mz:%s/ //g :noh 'z
map ,t :tabn map ,t :tabn
@ -122,3 +122,28 @@ if has("autocmd")
autocmd FileType html set sw=2 ts=2 sts=2 autocmd FileType html set sw=2 ts=2 sts=2
autocmd FileType xhtml set sw=2 ts=2 sts=2 autocmd FileType xhtml set sw=2 ts=2 sts=2
endif " has("autocmd") endif " has("autocmd")
if !exists('s:loaded')
s:loaded = 0
endif
if s:loaded
delfunction Bwmatch
delcommand Bwmatch
endif
function Bwmatch(exp)
let last = bufnr('$')
let index = 0
while index <= last
if bufexists(index) && bufname(index) =~ a:exp
execute ':bw ' . index
endif
let index += 1
endwhile
redraw!
endfunction
command -nargs=1 Bwmatch :call Bwmatch('<args>')
let s:loaded = 1