remote$ mkdir public_html/git (etch) remote$ GIT_DIR=~/public_html/git/monkeysphere.git git init-db remote$ cd ~/public_html/git/monkeysphere.git remote$ chmod a+x hooks/post-update # NOT SURE IF THIS IS NEEDED: remote$ git-update-server-info fetch = +refs/heads/*:refs/remotes/dkg/* (newer) remote$ mkdir -p public_html/git/monkey.git remote$ cd public_html/git/monkey.git remote$ git --bare init remote$ chmod a+x hooks/post-update remote$ git-update-server-info (new way! no origin/) $ cd ~/src $ mkdir monkeysphere $ cd monkeysphere $ git init $ git remote add -f mlcastle http://git.mlcastle.net/monkeysphere.git/ $ git remote add grunt grunt:/whatever $ git config remote.grunt.push "+refs/heads/*" $ git merge mlcastle/master $ git push grunt (old way!) (in ~/src or wherever) local$ git clone http://git.mlcastle.net/monkeysphere.git/ monkeysphere local$ cd monkeysphere .git/config: [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true ## THIS ONE NEEDS TO BE CHANGED TO YOUR REMOTE URI [remote "post"] url = YOUR-REMOTE-URL/git/monkeysphere.git push = +refs/heads/* ### THE ABOVE ONE NEEDS TO BE CHANGED [remote "mlcastle"] url = http://git.mlcastle.net/monkeysphere.git/ fetch = +refs/heads/*:refs/remotes/mlcastle/* [remote "jrollins"] url = http://lair.fifthhorseman.net/~jrollins/git/monkeysphere.git/ fetch = +refs/heads/*:refs/remotes/jrollins/* [remote "dkg"] url = http://lair.fifthhorseman.net/~dkg/git/monkeysphere.git/ fetch = +refs/heads/*:refs/remotes/dkg/* [remote "mjgoins"] SEE: dkg, jrollins, etc. [remote "jamie"] url = http://current.workingdirectory.net/projects/monkeysphere.git fetch = +refs/heads/*:refs/remotes/jamie/* [remote "micah"] url = http://micah.riseup.net/git/monkeysphere.git fetch = +refs/heads/*:refs/remotes/micah/* [remote "enw"] url = http://lair.fifthhorseman.net/~enw/git/monkeysphere.git/ fetch = +refs/heads/*:refs/remotes/enw/* [remote "rossg"] url = http://lair.fifthhorseman.net/~rossg/git/monkeysphere.git/ fetch = +refs/heads/*:refs/remotes/rossg/* [remote "greg"] url = http://lair.fifthhorseman.net/~greg/git/monkeysphere.git/ fetch = +refs/heads/*:refs/remotes/greg/* blood type = ----------------- [remote "upload"] url = ssh://z.mlcastle.net/var/www/git/monkeysphere.git/ push = +refs/heads/* $ git fetch dkg $ git checkout master $ git merge remotes/dkg/master $ git push post grunt's fingerprint: be:43:9c:03:9c:04:1a:97:7a:61:8a:fe:71:9d:6c:67 (grunt is lair.fifthhorseman.net) git remote update what are the configurations below? --------------------- set mainfont {Arial 12} set textfont { Courier 12} set uifont {Arial 10 bold} set tabstop 8 set findmergefiles 0 set maxgraphpct 50 set maxwidth 16 set cmitmode patch set wrapcomment none set showneartags 1 set showlocalchanges 1 set datetimeformat {%Y-%m-%d %H:%M:%S} set limitdiffs 1 set bgcolor white set fgcolor black set colors {green red blue magenta darkgrey brown orange} set diffcolors {red "#00a000" blue} set diffcontext 3 set selectbgcolor gray85 set geometry(main) 1280x936+14+28 set geometry(topwidth) 1278 set geometry(topheight) 286 set geometry(pwsash0) "638 1" set geometry(pwsash1) "903 1" set geometry(botwidth) 1001 set geometry(botheight) 638 set permviews {} --------------------- option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'> <tr><th>author</th><td>Jonas Smedegaard <dr@jones.dk></td><td class='right'>2023-06-27 09:35:08 +0200</td></tr> <tr><th>committer</th><td>Jonas Smedegaard <dr@jones.dk></td><td class='right'>2023-06-27 09:35:08 +0200</td></tr> <tr><th>commit</th><td colspan='2' class='oid'><a href='/notmuch/commit/tags/8c/97?h=master&id=fd54908da2b05c526dd3bee9b6dcd093214a220d'>fd54908da2b05c526dd3bee9b6dcd093214a220d</a> (<a href='/notmuch/patch/tags/8c/97?id=fd54908da2b05c526dd3bee9b6dcd093214a220d'>patch</a>)</td></tr> <tr><th>tree</th><td colspan='2' class='oid'><a href='/notmuch/tree/?h=master'>c69c845069c99d1d01044f6fafda7c08433329c6</a> /<a href='/notmuch/tree/tags/8c/97?h=master'>tags/8c/97</a></td></tr> <tr><th>parent</th><td colspan='2' class='oid'><a href='/notmuch/commit/tags/8c/97?h=master&id=ba46132213560cf3335d53560d519c0ec0190da2'>ba46132213560cf3335d53560d519c0ec0190da2</a> (<a href='/notmuch/diff/tags/8c/97?h=master&id2=ba46132213560cf3335d53560d519c0ec0190da2'>diff</a>)</td></tr></table> <div class='commit-subject'><span class='decoration'><a class='branch-deco' href='/notmuch/log/tags/8c/97?h=master'>master</a></span></div><div class='commit-msg'></div><div class='diffstat-header'><a href='/notmuch/diff/?h=master'>Diffstat</a> (limited to 'tags/8c/97')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/160063351636.20783.14547959717191962502.reportbug@asd/debian?h=master'>tags/8c/97/160063351636.20783.14547959717191962502.reportbug@asd/debian</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/160063351636.20783.14547959717191962502.reportbug@asd/unread?h=master'>tags/8c/97/160063351636.20783.14547959717191962502.reportbug@asd/unread</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20021230093912.GE26442@charite.de/inbox?h=master'>tags/8c/97/20021230093912.GE26442@charite.de/inbox</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20021230093912.GE26442@charite.de/old?h=master'>tags/8c/97/20021230093912.GE26442@charite.de/old</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20080512230930.274C511D8EF@xayide.jones.dk/jones?h=master'>tags/8c/97/20080512230930.274C511D8EF@xayide.jones.dk/jones</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20080512230930.274C511D8EF@xayide.jones.dk/sys?h=master'>tags/8c/97/20080512230930.274C511D8EF@xayide.jones.dk/sys</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20090101053049.GN22453@jones.dk/cipux?h=master'>tags/8c/97/20090101053049.GN22453@jones.dk/cipux</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20090101053049.GN22453@jones.dk/sent?h=master'>tags/8c/97/20090101053049.GN22453@jones.dk/sent</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20110119221923.5305.13002.malone@soybean.canonical.com/debian?h=master'>tags/8c/97/20110119221923.5305.13002.malone@soybean.canonical.com/debian</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20111127070904.GA14891@elie.hsd1.il.comcast.net/debian?h=master'>tags/8c/97/20111127070904.GA14891@elie.hsd1.il.comcast.net/debian</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20160708032734.GA4704@gmail.com/debian?h=master'>tags/8c/97/20160708032734.GA4704@gmail.com/debian</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20160708032734.GA4704@gmail.com/signed?h=master'>tags/8c/97/20160708032734.GA4704@gmail.com/signed</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20170204130002.3796C3B0@lxp5.free-owl.de/sys?h=master'>tags/8c/97/20170204130002.3796C3B0@lxp5.free-owl.de/sys</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20170204130002.3796C3B0@lxp5.free-owl.de/unread?h=master'>tags/8c/97/20170204130002.3796C3B0@lxp5.free-owl.de/unread</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20180407130053.8ABA9EAD@xayide.jones.dk/unread?h=master'>tags/8c/97/20180407130053.8ABA9EAD@xayide.jones.dk/unread</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20180821080001.3A2E41CD404@lxp5.free-owl.de/sys?h=master'>tags/8c/97/20180821080001.3A2E41CD404@lxp5.free-owl.de/sys</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20180821080001.3A2E41CD404@lxp5.free-owl.de/unread?h=master'>tags/8c/97/20180821080001.3A2E41CD404@lxp5.free-owl.de/unread</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20181126200001.D39311CCD8A@lxp5.free-owl.de/sys?h=master'>tags/8c/97/20181126200001.D39311CCD8A@lxp5.free-owl.de/sys</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/20181126200001.D39311CCD8A@lxp5.free-owl.de/unread?h=master'>tags/8c/97/20181126200001.D39311CCD8A@lxp5.free-owl.de/unread</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/9ddbdb03-248c-ab39-ebd4-959484a4f41e@debian.org/debian?h=master'>tags/8c/97/9ddbdb03-248c-ab39-ebd4-959484a4f41e@debian.org/debian</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/9ddbdb03-248c-ab39-ebd4-959484a4f41e@debian.org/inbox?h=master'>tags/8c/97/9ddbdb03-248c-ab39-ebd4-959484a4f41e@debian.org/inbox</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/9ddbdb03-248c-ab39-ebd4-959484a4f41e@debian.org/old?h=master'>tags/8c/97/9ddbdb03-248c-ab39-ebd4-959484a4f41e@debian.org/old</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/9ddbdb03-248c-ab39-ebd4-959484a4f41e@debian.org/signed?h=master'>tags/8c/97/9ddbdb03-248c-ab39-ebd4-959484a4f41e@debian.org/signed</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/BANLkTinaaGa5e+0TzDxnKybRMWeUUGkrSQ@mail.gmail.com/debian?h=master'>tags/8c/97/BANLkTinaaGa5e+0TzDxnKybRMWeUUGkrSQ@mail.gmail.com/debian</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/BANLkTinaaGa5e+0TzDxnKybRMWeUUGkrSQ@mail.gmail.com/replied?h=master'>tags/8c/97/BANLkTinaaGa5e+0TzDxnKybRMWeUUGkrSQ@mail.gmail.com/replied</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/handler.1002070.B.164009097911475.ack@bugs.debian.org/debian?h=master'>tags/8c/97/handler.1002070.B.164009097911475.ack@bugs.debian.org/debian</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/8c/97/handler.1002070.B.164009097911475.ack@bugs.debian.org/unread?h=master'>tags/8c/97/handler.1002070.B.164009097911475.ack@bugs.debian.org/unread</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr> </table><div class='diffstat-summary'>27 files changed, 0 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td>