updates

9 years ago · a747c97eef
parent 71b2d109d1
commit a747c97eef
6 changed files with 10 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
 .netrwhist
-vim/bundle
+vim/bundle/*
--- a/5
+++ b/5
@ -1,9 +1,12 @@
 _srcs
+log
+vendor
+tmp
 node_modules
+bower_compnents
 .sass-cache

 *.css
 *.min.css
 *.min.js
 *.min.map
-*.svg
--- a/2
+++ b/2
@ -61,3 +61,5 @@
 [user]
 	name = Steffen Rademacker
 	email = webgefrickel@gmail.com
+[push]
+	default = simple
--- a/2
+++ b/2
@ -548,7 +548,7 @@ call unite#custom_source('file_rec, file_rec/async, file_mru, file, buffer, grep
      \ 'node_modules',
      \ 'bower_components',
      \ 'vim\/bundle',
-      \ '\.\(png\|gif\|jpg\|pdf\|ico\|mp4\|webm\|svg\|mp3\|woff\|ttf\|eot\|min\.js\|min\.map\|css\)$',
+      \ '\.\(png\|gif\|jpg\|pdf\|ico\|mp4\|webm\|mp3\|woff\|ttf\|eot\|min\.js\|min\.map\|css\)$',
      \ ], '\|'))

 nmap <space> [unite]
--- a/zsh/dircolors-solarized
+++ b/zsh/dircolors-solarized
@ -1 +1 @@
-Subproject commit 4d9e622174c0ed4ea80ad7fe2ad2b8966d411c2b
+Subproject commit 5ce05320bf8b7bf2c684de94858d06e7c197f7c2
--- a/zsh/zsh-completions
+++ b/zsh/zsh-completions
@ -1 +1 @@
-Subproject commit ed964013e290677c866a055e1c1ece6f33f64151
+Subproject commit 6cc78eb382a62ad99cb0c900d4ed623af9cee10a