Add some git configuration

diff --git a/roles/git/templates/config.j2 b/roles/git/templates/config.j2
index f723f3330c196c9d5d01e492eb0e477176558e30..3ac8f74f05510cc68da2b91e51c0aa5da8d9bfca 100644 (file)
--- 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