Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 3 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Showing with 4 additions and 8 deletions.
  1. +0 −4 .gitmodules
  2. +0 −1 vim/bundle/vim-rooter
  3. +1 −1 vimrc
  4. +3 −2 zshrc
View
4 .gitmodules
@@ -18,10 +18,6 @@
path = vim/bundle/vim-fugitive
url = git://github.com/tpope/vim-fugitive.git
ignore = dirty
-[submodule "vim/bundle/vim-rooter"]
- path = vim/bundle/vim-rooter
- url = git://github.com/airblade/vim-rooter.git
- ignore = dirty
[submodule "vim/bundle/vim-endwise"]
path = vim/bundle/vim-endwise
url = git://github.com/tpope/vim-endwise.git
1 vim/bundle/vim-rooter
@@ -1 +0,0 @@
-Subproject commit c5b3e0052b2e074f8f490cb421fe75d482621077
View
2 vimrc
@@ -167,7 +167,7 @@ au FileType make set noexpandtab
au BufRead,BufNewFile *.txt call s:setupWrapping()
au BufRead,BufNewFile *.scss set filetype=scss " SCSS Files
au BufRead,BufNewFile jquery.*.js set ft=javascript syntax=jquery
-au BufNewFile,BufReadPost *.coffee setl shiftwidth=2 ft=coffeescript expandtab foldmethod=indent nofoldenable
+au BufNewFile,BufReadPost *.coffee setl shiftwidth=2 ft=coffee expandtab foldmethod=indent nofoldenable
" Thorfile, Rakefile, Vagrantfile and Gemfile are Ruby
au BufRead,BufNewFile {Gemfile,Rakefile,Vagrantfile,Thorfile,config.ru} set ft=ruby
View
5 zshrc
@@ -2,8 +2,6 @@
export ZSH=~/.zsh
. $ZSH/config
-# wtf?
-#. $ZSH/window
. $ZSH/prompt
. $ZSH/aliases
. $ZSH/completion
@@ -16,6 +14,9 @@ export ZSH=~/.zsh
# set the keyboard mode in terminal
set -o emacs # or vi if you prefer
+# keep this here as a fix for rake
+alias rake='noglob rake'
+
# print current directory to title bar
# osx lion now uses that when opening new
# terminal window or tab

No commit comments for this range

Something went wrong with that request. Please try again.