From df2c8be849eada76e660763fabf7d89f5b62aab4 Mon Sep 17 00:00:00 2001
From: darkelfe <jul.rosset@gmail.com>
Date: Fri, 25 Oct 2013 17:14:01 +0200
Subject: [PATCH] Ajout config git

---
 gitconfig | 25 +++++++++++++++++++++++++
 vim/vimrc |  7 ++++---
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 gitconfig

diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..0134e1f
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,25 @@
+[user]
+	name = darkelfe
+	email = jul.rosset@gmail.com
+[color]
+	diff = auto
+	status = auto
+	branch = auto
+[alias]
+	co = commit 
+	com = commit -m
+	coa = commit -a
+	coam = commit -am
+	ck = checkout
+	st = status
+	br = branch
+	link = branch --track
+	ln = log -n
+	lns = log --stat -n
+	ls = log --stat
+	uf = checkout --
+	cb = checkout
+	push = push --tags
+[core]
+	editor = vim
+	autocrlf = true
diff --git a/vim/vimrc b/vim/vimrc
index 5e96bfb..bbd611b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -115,9 +115,10 @@ autocmd BufEnter *.twig set filetype=htmljinja
 autocmd BufEnter *.mysql.sql set filetype=sqlmysql
 
 "	YML : tabulation de 4, avec expansion en espaces
-autocmd BufEnter *.yml set tabstop=4
-autocmd BufEnter *.yml set shiftwidth=4
-autocmd BufEnter *.yml set expandtab
+autocmd BufEnter *.yml set tabstop=4|set shiftwidth=4|set expandtab
+
+"	Ruby (apti) : tabulation de 2, avec expansion en espaces
+autocmd BufEnter apti set tabstop=2|set shiftwidth=2|set expandtab
 
 "=====================================================================
 " Replacer le curseur à la dernière édition