git: update config and add defaults for merging and rebasing

roles/git/templates/gitconfig.j2

@@ -1,30 +1,45 @@
-# This is Git's per-user configuration file.
-[user]
-# Please adapt and uncomment the following lines:
-	name = {{ git_user }}
-	email = {{ git_email }}
-{% if git_do_sign %}
-	signkey = {{ git_signkey }}
-	signingkey = {{ git_signingkey }}
-{% endif %}
-
+# This is Git's per-user configuration file,
+# this file is managed by ansible.
 {% if git_do_sign %}
 [gpg]
 	program = {{ git_gpg_program }}
-
 {% endif %}
-[commit]
 
+[user]
+	name = "{{ git_author }}"
+	email = {{ git_email }}
+{% if git_do_sign %}
+	signingkey = {{ git_signingkey }}
+{% endif %}
+
+[commit]
 {% if git_do_sign %}
 	gpgsign = true
 {% endif %}
 
-
 [alias]
 {% for alias in git_aliases %}
-        {{ alias.name }} = {{ alias.cmd }}
+	{{ alias.name }} = {{ alias.cmd }}
 {% endfor %}
 
+[pull]
+	rebase = {{ git_pull_rebase|bool|lower }}
+{% if git_pull_ff_only|bool %}
+	ff = only
+{% endif %}
+
+[rebase]
+	autostash = {{ git_rebase_autostash|bool|lower }}
+
+[merge]
+	autostash = {{ git_merge_autostash|bool|lower }}
+
+[init]
+	defaultBranch = {{ git_default_branch }}
+
+[core]
+	editor = {{ git_config_preferred_editor }}
+
 {% for cred in git_credentials %}
 [credential "{{ cred.remote_url }}"]
 	username = {{ cred.username }}