From b1e1cb16ee91ecd81b406541f2d253bd3a26ecc3 Mon Sep 17 00:00:00 2001
From: Bryan Dady <bryan@dady.us>
Date: Wed, 25 Dec 2024 22:51:20 -0700
Subject: [PATCH] fix: gitconfig rebase = merges

Signed-off-by: Bryan Dady <bryan@dady.us>
---
 private_dot_gitconfig.tmpl | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/private_dot_gitconfig.tmpl b/private_dot_gitconfig.tmpl
index f491085..25a16e7 100644
--- a/private_dot_gitconfig.tmpl
+++ b/private_dot_gitconfig.tmpl
@@ -65,28 +65,28 @@
 	aliases = config --get-regexp '^alias\\.'
 
 [user]
-  [credential]
-	helper = cache
+	name = Bryan Dady
+[credential]
   # https://learn.microsoft.com/en-us/azure/devops/repos/git/git-config?view=azure-devops&tabs=git-command-line#credential-helper
-  # helper = store
+  	helper = store
 [init]
 	defaultBranch = main
 [pull]
 # https://github.com/git/git/commit/66713ef3b00933755cdeff1ae823dda7b5843640
-	rebase = preserve
+	rebase = merges
 [core]
   # https://docs.github.com/en/get-started/getting-started-with-git/configuring-git-to-handle-line-endings
   # On Linux, use "input"
 	autocrlf = input
 [diff]
   # Also: EDITOR is probably set in env
-{{ if eq .chezmoi.os "darwin" }}
+{{- if eq .chezmoi.os "darwin" }}
 	guitool = code -r
 	tool =  code -rmeld
-{{ else if eq .chezmoi.os "linux" }}
+{{- else if eq .chezmoi.os "linux" }}
 	guitool = meld
 	tool = meld
-{{ end }}
+{{- end }}
 	guitool = meld
 	tool = meld
 [rebase]
@@ -97,17 +97,17 @@
 [http]
   # for macOS, this should maybe be updated to openssl
   # for Windows, this should be updated to schannel
-{{ if eq .chezmoi.os "darwin" }}
+{{- if eq .chezmoi.os "darwin" }}
 	sslBackend = openssl
-{{ else if eq .chezmoi.os "linux" }}
+{{- else if eq .chezmoi.os "linux" }}
 	sslBackend = gnutls
-{{ end }}
+{{- end }}
 [merge]
-{{ if eq .chezmoi.os "darwin" }}
+{{- if eq .chezmoi.os "darwin" }}
 	tool = code
-{{ else if eq .chezmoi.os "linux" }}
+{{- else if eq .chezmoi.os "linux" }}
 	tool= meld
-{{ end }}
+{{- end }}
 [filter "lfs"]
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process