From 473e5a636a61a7cca2492db1d79f860ab641ae3f Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Mon, 10 Jun 2013 11:37:57 +0200
Subject: [PATCH] Updated dotfile with git configuration

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 dot_files/gitconfig  | 45 +++++++++++++++++++++++++++++++++++++-------
 dot_files/gitmessage |  5 +++++
 2 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 dot_files/gitmessage

diff --git a/dot_files/gitconfig b/dot_files/gitconfig
index e970f511b..a0ea5062a 100644
--- a/dot_files/gitconfig
+++ b/dot_files/gitconfig
@@ -2,7 +2,8 @@
 # or include it if git > 0.7.10
 
 [alias]
-   commit = commit -s
+   commit = commit -s # Always sign commit
+   stash = stash -u   # you want to stash untracked files also
    st = status
    ci = commit
    br = branch
@@ -12,9 +13,39 @@
    loo = log --pretty=oneline --abbrev-commit
    lol = log --graph --decorate --pretty=oneline --abbrev-commit
    lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
-   rewrite-history = rebase -i HEAD~~
-   rewrite-history1 = rebase -i HEAD~
-   rewrite-history2 = rebase -i HEAD~~
-   rewrite-history3 = rebase -i HEAD~~~
-   rewrite-history4 = rebase -i HEAD~~~~
-   rewrite-history5 = rebase -i HEAD~~~~~
+   rewrite-history   = rebase -i HEAD~2
+   rewrite-history1  = rebase -i HEAD~
+   rewrite-history2  = rebase -i HEAD~2
+   rewrite-history3  = rebase -i HEAD~3
+   rewrite-history4  = rebase -i HEAD~4
+   rewrite-history5  = rebase -i HEAD~5
+   rewrite-history6  = rebase -i HEAD~6
+   rewrite-history7  = rebase -i HEAD~7
+   rewrite-history8  = rebase -i HEAD~8
+   rewrite-history9  = rebase -i HEAD~9
+   rewrite-history10 = rebase -i HEAD~10
+
+# This only works if git > 0.7.10
+# # [include]
+# #    path = /home/username/.oh-my-zsh/dot_files/gitconfig
+
+[color]
+ui = auto
+
+[core]
+editor = vim
+
+[commit]
+template = /home/username/.gitmessage
+
+[merge]
+tool = kdiff3
+
+[guitool "mergetool"]
+cmd = git mergetool --no-prompt
+
+[mergetool "kdiff3"]
+cmd = kdiff3
+args = --L1 base --L2 mine --L3 theirs $base $local $other -o $output
+keepBackup = false
+
diff --git a/dot_files/gitmessage b/dot_files/gitmessage
new file mode 100644
index 000000000..affc8ac47
--- /dev/null
+++ b/dot_files/gitmessage
@@ -0,0 +1,5 @@
+# Change short description
+#
+# Long description here
+# ...
+#