X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FAnsible.git;a=blobdiff_plain;f=roles%2Fgit%2Ftemplates%2Fconfig.j2;h=3ac8f74f05510cc68da2b91e51c0aa5da8d9bfca;hp=f723f3330c196c9d5d01e492eb0e477176558e30;hb=c9c165d18c6b0d07593d5f7d66b6f2605f1edd68;hpb=90b63575c59ee6ff6b91806fd17fb7a2f1136762

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