dotfiles

commit f30ecbd13ef1d4089e6ecbed7d718474855911d9 (patch)
parent dcb0b6ded5078d5fe421f62fb57f549b95a2f859
Author: Alex Karle <alex@karle.co>
Date:   Sat, 13 Jun 2020 23:16:08 -0400

git: Update config to set pull default behavior

It seems newer versions of git print a verbose warning if you type
"git pull" and don't have a default set.

In general, I want it to error if it can't fast forward (then I'll
run it again with rebase). I almost never want it to merge, but I
like to know that I had to rebase in the first place.

Diffstat:
M
git/config
 | 
2
++

1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/git/config b/git/config
@@ -11,3 +11,5 @@
 	smtpencryption = tls
 	smtpserverport = 587
         annotate = yes
+[pull]
+	ff = only