Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

newline

  • Loading branch information...
commit 311e898937efdd0e3e2b822faa249953037687a8 1 parent 3e0bb3a
@puzzlet authored
Showing with 50 additions and 50 deletions.
  1. +19 −19 .gitconfig
  2. +31 −31 .vimrc
View
38 .gitconfig
@@ -1,19 +1,19 @@
-[include]
- # works both in Linux/Windows
- path = .gitconfig_private
-[core]
- excludesfile = ~/.gitignore
- autocrlf = false
- eol = lf
-[push]
- default = upstream
-[diff]
- tool = vimdiff
-[difftool]
- prompt = false
-[merge]
- tool = vimdiff
-[color]
- ui = auto
-[bash]
- showDirtyState = true
+[include]
+ # works both in Linux/Windows
+ path = .gitconfig_private
+[core]
+ excludesfile = ~/.gitignore
+ autocrlf = false
+ eol = lf
+[push]
+ default = upstream
+[diff]
+ tool = vimdiff
+[difftool]
+ prompt = false
+[merge]
+ tool = vimdiff
+[color]
+ ui = auto
+[bash]
+ showDirtyState = true
View
62 .vimrc
@@ -1,32 +1,32 @@
-" farewell old vi
-set nocompatible
-
-set autoindent
-set expandtab
-set tabstop=4
-set softtabstop=4
-set shiftwidth=4
-
-set modeline
-
-autocmd BufNewFile,BufRead *.j2 set filetype=jinjahtml
-autocmd BufNewFile,BufRead *.pde setf arduino
-autocmd BufNewFile,BufRead *.yaml,*.yml so ~/.vim/yaml.vim
-
-"autocmd FileType python compiler pylint
-
-filetype plugin indent on
-
-call pathogen#infect()
-
-syntax enable
-
-" solarize
-if $TERM != "cygwin"
- set background=dark
- let g:solarized_italic=0
- if $TERM != "screen"
- let g:solarized_termcolors=256
- endif
- colorscheme solarized
+" farewell old vi
+set nocompatible
+
+set autoindent
+set expandtab
+set tabstop=4
+set softtabstop=4
+set shiftwidth=4
+
+set modeline
+
+autocmd BufNewFile,BufRead *.j2 set filetype=jinjahtml
+autocmd BufNewFile,BufRead *.pde setf arduino
+autocmd BufNewFile,BufRead *.yaml,*.yml so ~/.vim/yaml.vim
+
+"autocmd FileType python compiler pylint
+
+filetype plugin indent on
+
+call pathogen#infect()
+
+syntax enable
+
+" solarize
+if $TERM != "cygwin"
+ set background=dark
+ let g:solarized_italic=0
+ if $TERM != "screen"
+ let g:solarized_termcolors=256
+ endif
+ colorscheme solarized
endif
Please sign in to comment.
Something went wrong with that request. Please try again.