Permalink
Browse files

Merge branch 'master' of github.com:arrelid/preferences

  • Loading branch information...
2 parents de179f4 + 383787f commit 2cfa746110632bcd6cc7c12185a7d232b5b9975b @arrelid committed Feb 14, 2012
Showing with 5 additions and 8 deletions.
  1. +1 −4 dotfiles/gitconfig
  2. +4 −4 dotfiles/vimrc
View
@@ -4,7 +4,7 @@
whitespace = trailing-space,space-before-tab
excludesfile = ~/.gitignore
quotepath = false
-
+
[branch]
autosetuprebase = always
@@ -18,9 +18,6 @@
dfc = diff --cached
st = status
- up = pull origin master
- pu = push --tags origin master
-
# Tips and tricks for how to make logging prettier
# http://robey.lag.net/2008/07/13/git-for-the-real-world.html
# http://www.jukie.net/~bart/blog/pimping-out-git-log
View
@@ -30,7 +30,7 @@ set tabstop=2 " a tab is two spaces...
set softtabstop=2 " ...and the corresponding backspace removes the same amount of space
set shiftwidth=2 " indentation should follow tabstop, or stuff will have different indentation
set expandtab " expand tabs into spaces
-set nowrap " seriously, don't wrap by default
+set wrap " let's wrap by default
set linebreak " break on word barriers
set listchars=tab:»·,trail:·,precedes:<,extends:> " highlight these little bastard when 'set list' is invoked
set backspace=indent,eol,start " backspace through everything in insert mode
@@ -65,6 +65,7 @@ Bundle 'Lokaltog/vim-easymotion'
Bundle 'altercation/vim-colors-solarized'
Bundle 'bitc/vim-bad-whitespace'
Bundle 'git://git.wincent.com/command-t.git'
+Bundle 'mileszs/ack.vim'
Bundle 'tpope/vim-fugitive'
Bundle 'tpope/vim-repeat'
Bundle 'tpope/vim-surround'
@@ -74,9 +75,8 @@ Bundle 'tpope/vim-unimpaired'
filetype plugin indent on
if has("autocmd")
- autocmd FileType python setlocal ts=4 sts=4 sw=4 expandtab
- autocmd FileType c,cpp,objc setlocal ts=2 sts=2 sw=2 expandtab
- autocmd FileType text setlocal ts=2 sts=2 sw=2 expandtab wrap
+ autocmd FileType python setlocal ts=4 sts=4 sw=4 expandtab nowrap
+ autocmd FileType c,cpp,objc setlocal ts=2 sts=2 sw=2 expandtab nowrap
endif
" Command-T configuration

0 comments on commit 2cfa746

Please sign in to comment.