From c9c165d18c6b0d07593d5f7d66b6f2605f1edd68 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@fretlink.com>
Date: Sun, 9 Dec 2018 14:12:14 +0100
Subject: [PATCH] Add some git configuration

---
 roles/git/templates/config.j2 | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/roles/git/templates/config.j2 b/roles/git/templates/config.j2
index f723f33..3ac8f74 100644
--- a/roles/git/templates/config.j2
+++ b/roles/git/templates/config.j2
@@ -9,11 +9,30 @@
 [commit]
 	gpgsign = true
 	verbose = true
+[fetch]
+	prune = true
+[pull]
+	rebase = true
 [push]
 	gpgSign = if-asked
 {% if profile in role and role[profile] == "fretlink" %}
 [fretlink]
 	remote-name = upstream
+[remote]
+	pushDefault = origin
+[branch "development.stgit"]
+	stackformatversion = 2
+[branch "development"]
+	remote = upstream
+	pushRemote = origin
+	merge = refs/heads/development
+[branch "master.stgit"]
+	stackformatversion = 2
+[branch "master"]
+	remote = upstream
+	pushRemote = origin
+	merge = refs/heads/master
+	mergeOptions = --no-ff --no-edit
 {% endif %}
 [log]
 	showSignature = true
-- 
2.41.0