From 49f607777fe3d9393574a572d72caa568ee3ca3c Mon Sep 17 00:00:00 2001
From: John Keeping <john@keeping.me.uk>
Date: Sun, 3 Aug 2014 15:51:42 +0100
Subject: git: update to v2.0.4

No CGit changes required.

Signed-off-by: John Keeping <john@keeping.me.uk>
---
 git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git')

diff --git a/git b/git
index 740c281..32f5660 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 740c281d21ef5b27f6f1b942a4f2fc20f51e8c7e
+Subproject commit 32f56600bb6ac6fc57183e79d2c1515dfa56672f
-- 
cgit 1.4.1

id' value='2aa5fe545bdba997bdb728a2dfb2e3bca93766ae'/><input type='hidden' name='showmsg' value='1'/><select name='h' onchange='this.form.submit();'>
<option value='03d11f4c2798e6e39ccc6f39cc8cdeeabf8522f1'>this commit</option>
<optgroup label='branches'><option value='ansi'>ansi</option>
<option value='backport' selected='selected'>backport</option>
<option value='cgi'>cgi</option>
<option value='daemon'>daemon</option>
<option value='master'>master</option>
<option value='v1'>v1</option>
<option value='v2'>v2</option>
</optgroup></select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>collaborative ASCII art
</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/torus/about/?h=backport'>about</a> <a href='/torus/?h=backport'>summary</a> <a href='/torus/refs/?h=backport&amp;id=2aa5fe545bdba997bdb728a2dfb2e3bca93766ae'>refs</a> <a class='active' href='/torus/log/.gitignore?h=backport&amp;showmsg=1&amp;follow=1'>log</a> <a href='/torus/tree/.gitignore?h=backport&amp;id=2aa5fe545bdba997bdb728a2dfb2e3bca93766ae'>tree</a> <a href='/torus/commit/.gitignore?h=backport&amp;id=2aa5fe545bdba997bdb728a2dfb2e3bca93766ae&amp;follow=1'>commit</a> <a href='/torus/diff/.gitignore?h=backport&amp;id=2aa5fe545bdba997bdb728a2dfb2e3bca93766ae&amp;follow=1'>diff</a> <a href='https://ascii.town'>homepage</a></td><td class='form'><form class='right' method='get' action='/torus/log/.gitignore'>
<input type='hidden' name='h' value='backport'/><input type='hidden' name='id' value='2aa5fe545bdba997bdb728a2dfb2e3bca93766ae'/><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='/torus/log/?h=backport&amp;id=2aa5fe545bdba997bdb728a2dfb2e3bca93766ae&amp;showmsg=1&amp;follow=1'>root</a>/<a href='/torus/log/.gitignore?h=backport&amp;id=2aa5fe545bdba997bdb728a2dfb2e3bca93766ae&amp;showmsg=1&amp;follow=1'>.gitignore</a> (<a href='/torus/log/.gitignore?h=backport&amp;id=2aa5fe545bdba997bdb728a2dfb2e3bca93766ae&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='/torus/log/.gitignore?h=backport&amp;id=2aa5fe545bdba997bdb728a2dfb2e3bca93766ae&amp;follow=1'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2017-08-31 13:45:12 -0400'>2017-08-31</span></td><td class='logsubject'><a href='/torus/commit/merge.c?h=backport&amp;id=22198d6399a006f59d162b2e00a7b8205c8f6e9b&amp;follow=1'>Choose B for tiles with equal modify times</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
This way newer access counts and times will be preserved.


</td></tr>
<tr class='logheader'><td><span title='2017-08-31 01:00:02 -0400'>2017-08-31</span></td><td class='logsubject'><a href='/torus/commit/merge.c?h=backport&amp;id=2188bd834c546b40d4b19258f8729ecae86be853&amp;follow=1'>Add quick data file merge tool</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Hopefully I won't have to use it ever again.


</td></tr>
<tr class='logheader'><td><span title='2017-08-30 11:16:22 -0400'>2017-08-30</span></td><td class='logsubject'><a href='/torus/commit/client.c?h=backport&amp;id=38d460d2bae7569ec0c2d99086fd2fd5e8a8897c&amp;follow=1'>Use only foreground color for selecting spawn</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='2017-08-29 18:33:59 -0400'>2017-08-29</span></td><td class='logsubject'><a href='/torus/commit/torus.h?h=backport&amp;id=af645c09089d1ed8e99c760f05234ac3df402901&amp;follow=1'>Add four additional spawns</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='2017-08-28 23:38:40 -0400'>2017-08-28</span></td><td class='logsubject'><a href='/torus/commit/torus.h?h=backport&amp;id=ce13621292bdfeafd7c6561c432a1d96deccbd3a&amp;follow=1'>Add respawning</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='2017-08-26 23:46:14 -0400'>2017-08-26</span></td><td class='logsubject'><a href='/torus/commit/torus.h?h=backport&amp;id=ccdad79970a150eec64758e1a3b14b084d4cb42f&amp;follow=1'>Move license above includes</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Why was it down there?


</td></tr>
<tr class='logheader'><td><span title='2017-08-26 19:32:55 -0400'>2017-08-26</span></td><td class='logsubject'><a href='/torus/commit/snapshot.sh?h=backport&amp;id=e5184500830e04f3c9839d2dac62108fcb28133f&amp;follow=1'>Snapshot metadata</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='2017-08-26 16:51:14 -0400'>2017-08-26</span></td><td class='logsubject'><a href='/torus/commit/README?h=backport&amp;id=7cfc2d9b309c4c664a177e55441f88a64e15561c&amp;follow=1'>Add meta.c to README</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='2017-08-26 16:47:57 -0400'>2017-08-26</span></td><td class='logsubject'><a href='/torus/commit/server.c?h=backport&amp;id=592d0fbdc59c19c89bf4fd5498591d07b0d9c132&amp;follow=1'>Use Makefile</a></td><td>June McEnroe