Permalink
Browse files

Merge branch 'master' of https://github.com/philcrissman/dotfiles

  • Loading branch information...
2 parents 4d5619b + 5562c98 commit c2d03745365bc429ccefb115898e1bc323fe3218 Phil Crissman committed Feb 7, 2012
Showing with 25 additions and 14 deletions.
  1. +2 −1 .gitignore
  2. +2 −1 bash/aliases
  3. +3 −0 gitconfig
  4. +0 −7 vim/.netrwhist
  5. +6 −0 vim/.netrwhisz~
  6. +1 −1 vim/bundle/supertab
  7. +1 −1 vim/bundle/vim-rails
  8. +1 −1 vim/bundle/vim-ruby
  9. +1 −0 vim/bundle/vim-surround
  10. +8 −2 vimrc
View
@@ -6,4 +6,5 @@ bin/rake
bin/rdoc
bin/ruby
bin/ri
-bin/testrb
+bin/testrb
+vim/.net*
View
@@ -1,4 +1,5 @@
alias ls='ls -G'
alias ll='ls -lG'
-alias h=history
+alias h=history
+alias be='bundle exec'
View
@@ -27,3 +27,6 @@
[format]
pretty=format:%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%ar) %C(bold cyan)<%an>%Creset
+[github]
+ user = philcrissman
+ token = 61960e7e6a01659a132dcf75d90ca637
View
@@ -1,7 +0,0 @@
-let g:netrw_dirhistmax =10
-let g:netrw_dirhist_cnt =5
-let g:netrw_dirhist_1='/Users/pcrissman/Documents/Parallels/WIN_SHARED/Rails/therese/app/views/campaigns'
-let g:netrw_dirhist_2='/Users/pcrissman/Documents/Parallels/WIN_SHARED/Rails/siesse_trunk/app/models'
-let g:netrw_dirhist_3='/Users/pcrissman/Documents/Parallels/WIN_SHARED/Rails/siesse_trunk/test/functional'
-let g:netrw_dirhist_4='/Users/pcrissman/Documents/Parallels/WIN_SHARED/Rails/siesse_trunk/.svn/pristine/54'
-let g:netrw_dirhist_5='/Users/pcrissman/Documents/Parallels/WIN_SHARED/Rails/siesse_trunk/lib/common/model_mixins'
View
@@ -0,0 +1,6 @@
+let g:netrw_dirhistmax =10
+let g:netrw_dirhist_cnt =4
+let g:netrw_dirhist_1='/Users/philcrissman/Projects/slantwise/archivers_net/app/views/admin/articles'
+let g:netrw_dirhist_2='/Users/philcrissman/Projects/slantwise/archivers_net/app/views/admin/article_folders'
+let g:netrw_dirhist_3='/Users/philcrissman/Projects/slantwise/archivers_net/app/models'
+let g:netrw_dirhist_4='/Users/philcrissman/Projects/slantwise/gsn2/app/views/layouts'
Submodule supertab updated from 688b5d to dbc0f1
Submodule vim-rails updated from e45164 to 893ef3
Submodule vim-ruby updated from 85227b to 852596
Submodule vim-surround added at 4eb2cd
View
10 vimrc
@@ -1,13 +1,19 @@
-call pathogen#runtime_append_all_bundles()
+call pathogen#infect()
+
+set nocompatible
+
+set number
+set ruler
+
syntax enable
set background=dark
colorscheme solarized
set expandtab
set tabstop=2
set shiftwidth=2
-set number
+filetype plugin indent on
if has("autocmd")
filetype plugin indent on
else

0 comments on commit c2d0374

Please sign in to comment.