From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 5 May 2008 14:56:26 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.1-1~73
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=85dfda57ca7f89b9ef381ceba425c27844440d14;hp=60b8c51d6772a1bd8ba9b2416968a74c09000f3b;p=monkeysphere.git

Merge commit 'jrollins/master'
---

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/*