summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlaise Thompson <blaise@untzag.com>2021-02-03 17:10:28 -0600
committerBlaise Thompson <blaise@untzag.com>2021-02-03 17:10:28 -0600
commitdcba6f27b2af50231270a09908bf287ab8104454 (patch)
tree4176a80ccabbffcb3c9bb8f684f4445970f5051a
parent7534913cd8c63462ca0b1e3e198d54cc476e1b1e (diff)
2021-02-03 17:10
-rw-r--r--git/gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/git/gitconfig b/git/gitconfig
index 7175704..a8a6365 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -11,3 +11,5 @@
rebase = false
[init]
templateDir = /home/blaise/.git-template
+[branch]
+ autosetupmerge = true