summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-07-20 13:47:38 -0400
committerJune McEnroe <june@causal.agency>2020-07-20 13:47:50 -0400
commite4ac888ae0369cf69cbd63515148077779a3230e (patch)
treed4249defc75956064d11998467a1163938b71d9a
parentRead from stdin in order (diff)
downloadsrc-e4ac888ae0369cf69cbd63515148077779a3230e.tar.gz
src-e4ac888ae0369cf69cbd63515148077779a3230e.zip
Set pull.rebase true
-rw-r--r--home/.config/git/config3
1 files changed, 3 insertions, 0 deletions
diff --git a/home/.config/git/config b/home/.config/git/config
index 5c12c079..71799784 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -8,6 +8,9 @@
 [merge]
 	conflictStyle = diff3
 
+[pull]
+	rebase = true
+
 [rebase]
 	autosquash = true
 
>Add xmodmap configurationJune McEnroe 2021-02-06Add initial OpenBSD X configurationJune McEnroe cwm still needs a lot more rebinding, and I need to actually look at its other options. xterm definitely still needs some configuration, but I at least managed to get it to use a decent looking font. Very happy that OpenBSD includes Luxi Mono, which is what my usual font, Go Mono, is based on anyway. Still missing is xmodmap and such. 2021-02-06Add xterm output to schemeJune McEnroe