Permalink
Browse files

Merge branch 'master' of github.com:mattly/dotfiles

  • Loading branch information...
2 parents 648017c + 6e55087 commit e3c1ab36c3a48bd33e6641cb702d7a4bec72020c @mattly committed Aug 14, 2012
Showing with 6 additions and 10 deletions.
  1. +1 −0 .gitignore
  2. +3 −7 .gitmodules
  3. +1 −1 install.rb
  4. +0 −1 vim/bundle/tcomment_vim.git
  5. +1 −0 vim/bundle/vim-commentary.git
  6. +0 −1 vim/bundle_disabled/nerdtree.git
View
1 .gitignore
@@ -1,5 +1,6 @@
config/fish/fish_history
config/fish/fishd*
+config/hub
vim/session
vim/.netrwhist
vim/bundle/*/doc/*
View
10 .gitmodules
@@ -62,10 +62,6 @@
path = vim/bundle/vim-javascript.git
url = https://github.com/pangloss/vim-javascript.git
ignore = untracked
-[submodule "vim/bundle/tcomment_vim.git"]
- path = vim/bundle/tcomment_vim.git
- url = https://github.com/tomtom/tcomment_vim.git
- ignore = untracked
[submodule "vim/bundle/colors-solarized.git"]
path = vim/bundle/colors-solarized.git
url = https://github.com/altercation/vim-colors-solarized.git
@@ -100,9 +96,6 @@
[submodule "vim/bundle/ctrlp.vim.git"]
path = vim/bundle/ctrlp.vim.git
url = https://github.com/kien/ctrlp.vim.git
-[submodule "vim/bundle/nerdtree.git"]
- path = vim/bundle/nerdtree.git
- url = https://github.com/scrooloose/nerdtree.git
[submodule "vim/bundle/vim-les.git"]
path = vim/bundle/vim-les.git
url = https://github.com/groenewege/vim-less.git
@@ -112,3 +105,6 @@
[submodule "vim/bundle/gitv.git"]
path = vim/bundle/gitv.git
url = https://github.com/gregsexton/gitv.git
+[submodule "vim/bundle/vim-commentary.git"]
+ path = vim/bundle/vim-commentary.git
+ url = https://github.com/tpope/vim-commentary.git
View
2 install.rb
@@ -17,5 +17,5 @@
`ln -s #{File.expand_path file} #{target}`
end
-%w(env dir_aliases).each {|f| `touch #{home}/.#{f}` }
+%w(env).each {|f| `touch #{home}/.#{f}` }
`mkdir #{home}/.zsh_cache` unless File.exists?("#{home}/.zsh_cache")
1 vim/bundle/tcomment_vim.git
@@ -1 +0,0 @@
-Subproject commit 4d55a4b55666a5846956655e1a1ca30004702b06
1 vim/bundle/vim-commentary.git
@@ -0,0 +1 @@
+Subproject commit dc349bb7d30f713d770fc1fa0fe209e6aab82dc8
1 vim/bundle_disabled/nerdtree.git
@@ -1 +0,0 @@
-Subproject commit eced5f98a0724cd6498b70024b3edec1e7b29b2e

0 comments on commit e3c1ab3

Please sign in to comment.