update git history

2021-03-08 22:04:35 -08:00
parent 4d87c74a0d
commit a807614e61
4 changed files with 22 additions and 15 deletions
--- a/2
+++ b/2
@@ -8,3 +8,5 @@
 	email = smparkin@calpoly.edu
 [core]
 	excludesfile = ~/.gitignore_global
+[pull]
+	rebase = false