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

aliases

@@ -37,7 +37,7 @@ alias gdss="git diff --shortstat"
 alias gfa="git-date-added"
 alias gfl="git log --patch"
 alias gi="gitignore-io"
-alias gl="git log"
+alias gl="git lol"
 alias gh="git hist"
 alias ghd="git hist-details"
 alias ght="git hist-tags"

functions

@@ -38,3 +38,15 @@ function git-date-added {
     git log --format=%aD $1 | tail -1
   fi
 }
+
+function run {
+  if [ $# -lt 2 ]; then
+    echo Usage: run NUMBER COMMAND
+  else
+    number=$1; shift
+
+    for i in `seq $number`; do
+      $@
+    done
+  fi
+}

gitconfig

@@ -10,6 +10,7 @@
   hist = log --graph --pretty=format:'%Cred%h%Creset - %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
   hist-details = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
   hist-tags = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
+  lol = log --graph --decorate --pretty=oneline --abbrev-commit
   most-recent-by-branch = for-each-ref --sort=committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'
 [color]
     ui = auto

linux.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if test ! -d ~/.rbenv ; then
+	git clone https://github.com/rbenv/rbenv.git ~/.rbenv
+fi
+if test ! -d ~/.rbenv/plugins/ruby-build ; then
+	git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
+fi

vimrc

@@ -252,12 +252,6 @@ function! SetColors()
   highlight ColorColumn ctermbg=234
   highlight IndentGuidesOdd  ctermbg=black
   highlight IndentGuidesEven ctermbg=234
-  " fix for vimgutter
-  highlight clear SignColumn
-  highlight GitGutterAdd ctermfg=green
-  highlight GitGutterChange ctermfg=yellow
-  highlight GitGutterDelete ctermfg=red
-  highlight GitGutterChangeDelete ctermfg=yellow
 endfunction
 
 " Needs to come after SetColors definition