From 9aa595ec4543187906cc166c1c173b863717ea96 Mon Sep 17 00:00:00 2001 From: Jamie McClelland Date: Sat, 3 May 2008 13:54:38 -0400 Subject: adding jamie's git remote stanza. --- doc/git init | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/git init b/doc/git init index 7ba5071..8ddc400 100644 --- a/doc/git init +++ b/doc/git init @@ -57,6 +57,10 @@ local$ cd monkeysphere [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/* -- cgit v1.2.3 From 05d843ab3367c4502e924d08c45b6741ea128e05 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Mon, 5 May 2008 11:19:23 -0400 Subject: cleaning up the git initialization document. --- doc/git init | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/git init b/doc/git init index 8ddc400..612d477 100644 --- a/doc/git init +++ b/doc/git init @@ -98,10 +98,10 @@ $ 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) -for foo in $(git remote); do git fetch $foo; done - - +git remote update +what are the configurations below? +--------------------- set mainfont {Arial 12} set textfont { Courier 12} set uifont {Arial 10 bold} @@ -129,4 +129,4 @@ set geometry(pwsash1) "903 1" set geometry(botwidth) 1001 set geometry(botheight) 638 set permviews {} - +--------------------- -- cgit v1.2.3 From 19b2668dfef84687e052c42638ad7e696d5fa6a6 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Mon, 5 May 2008 11:20:10 -0400 Subject: getting rid of spaces in filenames. --- doc/git init | 132 ----------------------------------------------------------- doc/git-init | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 132 deletions(-) delete mode 100644 doc/git init create mode 100644 doc/git-init (limited to 'doc') diff --git a/doc/git init b/doc/git init deleted file mode 100644 index 612d477..0000000 --- a/doc/git init +++ /dev/null @@ -1,132 +0,0 @@ -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 {} ---------------------- diff --git a/doc/git-init b/doc/git-init new file mode 100644 index 0000000..612d477 --- /dev/null +++ b/doc/git-init @@ -0,0 +1,132 @@ +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 {} +--------------------- -- cgit v1.2.3