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 {} --------------------- 0</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</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><div class='diffstat-header'><a href='/notmuch/diff/?h=master'>Diffstat</a> (limited to 'tags/b7/da/20200828105625.GA13292@angband.pl/debian')</div><table summary='diffstat' class='diffstat'>