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

2018-09-11 22:42:23 -05:00 · 2018-09-11 22:42:23 -05:00 · 26fdce818d
commit 26fdce818d
parent b51e75495c 66168ee036
2 changed files with 4 additions and 0 deletions
--- a/3
+++ b/3
@ -27,6 +27,9 @@
 [push]
 	default = simple

+[pull]
+	rebase = true
+
 [commit]
 	gpgsign = true

--- a/1
+++ b/1
@ -66,6 +66,7 @@ done

 VIMPLUGS=(
  "w0rp/ale"
+  "editorconfig/editorconfig-vim"
  "junegunn/fzf.vim"
  "sheerun/vim-polyglot"
  "jelera/vim-javascript-syntax"