From a3e655fdd04b879bd821d41a3540cdb7a7862481 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Mon, 20 Jul 2020 13:47:38 -0400
Subject: Set pull.rebase true

---
 home/.config/git/config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/home/.config/git/config b/home/.config/git/config
index 50a6a885..36b96776 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -8,6 +8,9 @@
 [merge]
 	conflictStyle = diff3
 
+[pull]
+	rebase = true
+
 [rebase]
 	autosquash = true
 
-- 
cgit 1.4.1

put type='hidden' name='id' value='21b0300a4ddbebc32447a5f0e58d587feffa2d3f'/><input type='hidden' name='showmsg' value='1'/><select name='h' onchange='this.form.submit();'>
<option value='bf01f9f8f8a2d3f71cab0339c1483d359c1dc114'>this commit</option>
<optgroup label='branches'><option value='master' selected='selected'>master</option>
</optgroup></select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>dontfiles
</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/src/'>summary</a> <a href='/src/refs/?id=21b0300a4ddbebc32447a5f0e58d587feffa2d3f'>refs</a> <a class='active' href='/src/log/doc/zlib/deflatePrime.3?showmsg=1&amp;follow=1'>log</a> <a href='/src/tree/doc/zlib/deflatePrime.3?id=21b0300a4ddbebc32447a5f0e58d587feffa2d3f'>tree</a> <a href='/src/commit/doc/zlib/deflatePrime.3?id=21b0300a4ddbebc32447a5f0e58d587feffa2d3f&amp;follow=1'>commit</a> <a href='/src/diff/doc/zlib/deflatePrime.3?id=21b0300a4ddbebc32447a5f0e58d587feffa2d3f&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/doc/zlib/deflatePrime.3'>
<input type='hidden' name='id' value='21b0300a4ddbebc32447a5f0e58d587feffa2d3f'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=21b0300a4ddbebc32447a5f0e58d587feffa2d3f&amp;showmsg=1&amp;follow=1'>root</a>/<a href='/src/log/doc?id=21b0300a4ddbebc32447a5f0e58d587feffa2d3f&amp;showmsg=1&amp;follow=1'>doc</a>/<a href='/src/log/doc/zlib?id=21b0300a4ddbebc32447a5f0e58d587feffa2d3f&amp;showmsg=1&amp;follow=1'>zlib</a>/<a href='/src/log/doc/zlib/deflatePrime.3?id=21b0300a4ddbebc32447a5f0e58d587feffa2d3f&amp;showmsg=1&amp;follow=1'>deflatePrime.3</a> (<a href='/src/log/doc/zlib/deflatePrime.3?id=21b0300a4ddbebc32447a5f0e58d587feffa2d3f&amp;showmsg=1'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/doc/zlib/deflatePrime.3?id=21b0300a4ddbebc32447a5f0e58d587feffa2d3f&amp;follow=1'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2021-02-07 16:32:14 -0500'>2021-02-07</span></td><td class='logsubject'><a href='/src/commit/home/.xsession?id=415cdd3e2f62dc3234d753789d70a059750d09cd&amp;follow=1'>Set X key repeat rate</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2021-02-07 16:32:14 -0500'>2021-02-07</span></td><td class='logsubject'><a href='/src/commit/home/.config/cwm/cwmrc?id=8ba3e92fc79476559bd09e44477140bb5559112b&amp;follow=1'>Bump font size to 12</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
11 is what I use on macOS, but I feel like my eyes are working
harder here.


</td></tr>
<tr class='logheader'><td><span title='2021-02-07 16:32:14 -0500'>2021-02-07</span></td><td class='logsubject'><a href='/src/commit/home/.config/cwm/cwmrc?id=8db86d36298a78e381771d63f1b17ced79712e21&amp;follow=1'>Fully configure and rebind cwm</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
This is sort of a mix of trying to emulate macOS somewhat for my
muscle memory and just rebinding some of the cwm defaults to use
4- rather than M-.


</td></tr>
<tr class='logheader'><td><span title='2021-02-07 13:36:10 -0500'>2021-02-07</span></td><td class='logsubject'><a href='/src/commit/txt/books.txt?id=7d9fcc56afeb3fff34c11fd19b2a28d0253b4add&amp;follow=1'>Add Binti</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2021-02-07 00:06:34 -0500'>2021-02-07</span></td><td class='logsubject'><a href='/src/commit/home/.config/X/resources?id=6ba9ec6ffe3fb7b63282f965477b75bf2c9b54b0&amp;follow=1'>Finish configuring xterm</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2021-02-06 23:13:47 -0500'>2021-02-06</span></td><td class='logsubject'><a href='/src/commit/etc/wsconsctl.conf?id=615e9ea88e9180c4386c7f2876f6d370715665f4&amp;follow=1'>Enable tapping, reverse scroll, set scaling in wsconsctl</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2021-02-06 23:02:02 -0500'>2021-02-06</span></td><td class='logsubject'><a href='/src/commit/home/.xsession?id=bed16967d6c1d893e72d7e38d1e39df1c7801578&amp;follow=1'>Set root window to black on purple snow</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2021-02-06 22:30:10 -0500'>2021-02-06</span></td><td class='logsubject'><a href='/src/commit/home/.xsession?id=af835d81e1468573e979ff339fe403eaa14af938&amp;follow=1'>Add xmodmap configuration</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2021-02-06 20:23:45 -0500'>2021-02-06</span></td><td class='logsubject'><a href='/src/commit/home/.xsession?id=2865d6fccb2036150bb36eed1a4b8e6d70889e7a&amp;follow=1'>Add initial OpenBSD X configuration</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
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.


</td></tr>
<tr class='logheader'><td><span title='2021-02-06 19:48:14 -0500'>2021-02-06</span></td><td class='logsubject'><a href='/src/commit/bin/scheme.c?id=34894724b0a85f7d047f31dcdc893dbd47b8f9c3&amp;follow=1'>Add xterm output to scheme</a></td><td>June McEnroe