add git config

dot_config/git/config

@@ -0,0 +1,24 @@
+[user]
+	email = joel@beckmeyer.us
+	name = Joel Beckmeyer
+[color]
+	ui = auto
+[push]
+	default = current
+[filesystem "N/A|13.0.2|/dev/sda2"]
+	timestampResolution = 10000 nanoseconds
+	minRacyThreshold = 6379 microseconds
+[merge]
+	tool = meld
+[review "review.lineageos.org"]
+	username = jbeckmeyer
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
+[pull]
+	rebase = false
+[core]
+	autocrlf = input
+	safecrlf = true

dot_local/bin/executable_xxtip

@@ -8,8 +8,5 @@ back_to_current_branch() {
 	exit 1
 }
 
-git checkout master
-git pull --rebase upstream master
-git push -f
-git checkout "$current_branch"
-git rebase master
+git fetch upstream master
+git rebase upstream/master