diff options
| author | Ismaël Bouya <ismael.bouya@fretlink.com> | 2018-12-09 14:12:14 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@fretlink.com> | 2018-12-09 14:12:14 +0100 |
| commit | c9c165d18c6b0d07593d5f7d66b6f2605f1edd68 (patch) | |
| tree | 56f6bf935011423301800f58eab68e5b4e5af892 /roles | |
| parent | 90b63575c59ee6ff6b91806fd17fb7a2f1136762 (diff) | |
| download | Ansible-c9c165d18c6b0d07593d5f7d66b6f2605f1edd68.tar.gz Ansible-c9c165d18c6b0d07593d5f7d66b6f2605f1edd68.tar.zst Ansible-c9c165d18c6b0d07593d5f7d66b6f2605f1edd68.zip | |
Add some git configuration
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/git/templates/config.j2 | 19 |
1 files changed, 19 insertions, 0 deletions
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 @@ | |||
| 9 | [commit] | 9 | [commit] |
| 10 | gpgsign = true | 10 | gpgsign = true |
| 11 | verbose = true | 11 | verbose = true |
| 12 | [fetch] | ||
| 13 | prune = true | ||
| 14 | [pull] | ||
| 15 | rebase = true | ||
| 12 | [push] | 16 | [push] |
| 13 | gpgSign = if-asked | 17 | gpgSign = if-asked |
| 14 | {% if profile in role and role[profile] == "fretlink" %} | 18 | {% if profile in role and role[profile] == "fretlink" %} |
| 15 | [fretlink] | 19 | [fretlink] |
| 16 | remote-name = upstream | 20 | remote-name = upstream |
| 21 | [remote] | ||
| 22 | pushDefault = origin | ||
| 23 | [branch "development.stgit"] | ||
| 24 | stackformatversion = 2 | ||
| 25 | [branch "development"] | ||
| 26 | remote = upstream | ||
| 27 | pushRemote = origin | ||
| 28 | merge = refs/heads/development | ||
| 29 | [branch "master.stgit"] | ||
| 30 | stackformatversion = 2 | ||
| 31 | [branch "master"] | ||
| 32 | remote = upstream | ||
| 33 | pushRemote = origin | ||
| 34 | merge = refs/heads/master | ||
| 35 | mergeOptions = --no-ff --no-edit | ||
| 17 | {% endif %} | 36 | {% endif %} |
| 18 | [log] | 37 | [log] |
| 19 | showSignature = true | 38 | showSignature = true |