Merge branch 'master' of github.com:adamlsd/cshenv

2022-05-23 17:01:55 -04:00
parent 861132a187 ac869bf860
commit 9bc6b1a248
1 changed files with 5 additions and 0 deletions
--- a/git/gitconfig
+++ b/git/gitconfig
@ -42,5 +42,10 @@
 [diff]
    indentheuristic = true

+[pull]
+	rebase = false

+
+#
 # vim: ft=gitconfig
+#