2 files changed, 30 insertions, 0 deletions

diff --git a/home/.gitconfig b/home/.gitconfig
new file mode 100644
index 0000000..17ace36
--- /dev/null
+++ b/home/.gitconfig
@@ -0,0 +1,26 @@
+[user]
+        name = Tristan Williams
+        email = tgwil@tgwil.net
+        username = tgwil
+[include]
+  # .gitconfig.local used for GPG secret only
+  path = ~/.gitconfig.local
+[core]
+        editor = emacsclient
+        autocrlf = input
+[commit]
+        gpgsign = true
+        verbose = true
+[init]
+        defaultBranch = stable
+[merge]
+        conflictstyle = zdiff3
+[diff]
+        algorithm = histogram
+        context = 5
+[log]
+        date = iso
+[gpg]
+        program = gpg2
+[safe]
+        directory = *
diff --git a/new-user-setup.sh b/new-user-setup.sh
index 072404b..e52a8fa 100755
--- a/new-user-setup.sh
+++ b/new-user-setup.sh
@@ -151,6 +151,10 @@ place_file $HOME/dotfiles.core/home/.bash_aliases $HOME/.bash_aliases
 place_directory $HOME/.gnupg/
 place_file $HOME/dotfiles.core/home/.gnupg/gpg-agent.conf $HOME/.gnupg/gpg-agent.conf
 
+# Git configuration
+place_file $HOME/dotfiles.core/home/.gitconfig $HOME/.gitconfig
+echo -e "${WARN}WARNING: ~/.gitconfig.local should be placed manually${ENDCOLOR}"
+
 
 ########################################################################
 ## END OF SCRIPT