Merge branch 'master' of potokar.us:easton/dotfiles

2025-03-07 19:20:10 -05:00
parent c1adcc3ebb 63181f9e6a
commit 80c877d8ed
32 changed files with 22764 additions and 3 deletions
--- a/.gitconfig
+++ b/.gitconfig
@@ -7,3 +7,5 @@
 	tool = vimdiff
 [difftool]
 	prompt = false
+[pull]
+	rebase = false