Merge branch 'master' into cucumber

.gitconfig_includes.common

@@ -1,29 +1,29 @@
-[user]
-	name = Cyryl Płotnicki-Chudyk
-	email = cyplo@cyplo.net
-[color]
-	ui = true
-[help]
-	autocorrect = 1
-[push]
-	default = simple
-[core]
-	pager = cat
-[alias]
-    tree = log --show-signature --color --decorate --date=short --all --graph -n 9
-    head = log HEAD -n1
-[core]
-    autocrlf = false
-[diff]
-    tool = vimdiff
-[difftool]
-    prompt = false
-[difftool "vimdiff"]
-    cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off'
-[merge]
-    tool = kdiff3
-[mergetool]
-	keepBackup = false
-[pager]
-    diff = diff-so-fancy | less --tabs=1,5 -RFX
-    show = diff-so-fancy | less --tabs=1,5 -RFX
+[user]
+    name = Cyryl Płotnicki
+    email = cyplo@cyplo.net
+[color]
+    ui = true
+[help]
+    autocorrect = 1
+[push]
+    default = simple
+[core]
+    pager = cat
+[alias]
+    tree = log --show-signature --color --decorate --date=short --all --graph -n 8
+    head = log HEAD -n1
+[core]
+    autocrlf = false
+[diff]
+    tool = vimdiff
+[difftool]
+    prompt = false
+[difftool "vimdiff"]
+    cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off'
+[merge]
+    tool = kdiff3
+[mergetool]
+    keepBackup = false
+[pager]
+    diff = diff-so-fancy | less --tabs=1,5 -RFX
+    show = diff-so-fancy | less --tabs=1,5 -RFX

.vimrc

@@ -79,6 +79,9 @@ Plugin 'Valloric/YouCompleteMe'
 call vundle#end()
 filetype plugin indent on
 
+" line ending
+set fileformats=unix,dos
+
 " colours
 set t_Co=256
 syntax enable