latest

editors/emacs/spacemacs

@@ -49,6 +49,8 @@
    dotspacemacs-additional-packages
    '(
      yaml-mode
+     haml-mode
+     gitconfig
      ansi-color
      )
    ;; A list of packages and/or extensions that will not be install and loaded.
@@ -205,6 +207,7 @@ layers configuration."
  '(ahs-idle-timer 0 t)
  '(ahs-inhibit-face-list nil)
  '(paradox-github-token t)
+ '(projectile-use-git-grep t)
  '(ring-bell-function (quote ignore) t))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.

editors/vim/bundle/neobundle.vim

@@ -1 +1 @@
-Subproject commit 2fda048ce43d0540e88f2763629713c6f9151473
+Subproject commit 538ca07acd4217e79d130809c8c7e2df15449adc

install.yml

@@ -9,6 +9,7 @@
   languages/ruby/irbrc: ~/.irbrc
   languages/ruby/rdebugrc: ~/.rdebugrc
   languages/ruby/railsrc: ~/.railsrc
+  languages/ruby/rspec: ~/.rspec
   misc/ackrc: ~/.ackrc
   misc/ctags: ~/.ctags
   misc/inputrc: ~/.inputrc

languages/ruby/rspec

@@ -0,0 +1,2 @@
+--color
+--order rand

vcs/git/gitconfig

@@ -1,5 +1,5 @@
 [alias]
-	st = status -s -b
+	st = status
 	pl = pull --rebase
 	p = push
 	co = checkout
@@ -73,6 +73,18 @@
 [heroku]
 	account = heroku
 [push]
-	default = simple
+	default = current
 [advice]
 	statusHints = false
+[remote]
+	pushdefault = origin
+[status]
+	short = true
+	branch = true
+	showUntrackedFiles = all
+	submoduleSummary = 1
+[versionsort]
+	prereleaseSuffix = -rc
+	prereleaseSuffix = -pre
+	prereleaseSuffix = -alpha
+	prereleaseSuffix = -beta