Merge commit 'mlcastle/master'
[monkeysphere.git] / doc / git init
1 remote$ mkdir public_html/git
2 (etch)
3 remote$ GIT_DIR=~/public_html/git/monkeysphere.git git init-db
4 remote$ cd ~/public_html/git/monkeysphere.git
5 remote$ chmod a+x hooks/post-update
6 # NOT SURE IF THIS IS NEEDED: remote$ git-update-server-info
7 fetch = +refs/heads/*:refs/remotes/dkg/*
8
9 (newer)
10 remote$ mkdir -p public_html/git/monkey.git
11 remote$ cd public_html/git/monkey.git
12 remote$ git --bare init
13 remote$ chmod a+x hooks/post-update
14 remote$ git-update-server-info
15
16 (new way! no origin/)
17 $ cd ~/src
18 $ mkdir monkeysphere
19 $ cd monkeysphere
20 $ git init
21 $ git remote add -f mlcastle http://git.mlcastle.net/monkeysphere.git/
22 $ git remote add grunt grunt:/whatever
23 $ git config remote.grunt.push "+refs/heads/*"
24 $ git merge mlcastle/master
25 $ git push grunt
26
27 (old way!)
28 (in ~/src or wherever)
29 local$ git clone http://git.mlcastle.net/monkeysphere.git/ monkeysphere
30 local$ cd monkeysphere
31
32 .git/config:
33
34 [core]
35         repositoryformatversion = 0
36         filemode = true
37         bare = false
38         logallrefupdates = true
39
40 ## THIS ONE NEEDS TO BE CHANGED TO YOUR REMOTE URI
41 [remote "post"]
42         url = YOUR-REMOTE-URL/git/monkeysphere.git
43         push = +refs/heads/*
44 ### THE ABOVE ONE NEEDS TO BE CHANGED
45
46 [remote "mlcastle"]
47         url = http://git.mlcastle.net/monkeysphere.git/
48         fetch = +refs/heads/*:refs/remotes/mlcastle/*
49
50 [remote "jrollins"]
51         url = http://lair.fifthhorseman.net/~jrollins/git/monkeysphere.git/
52         fetch = +refs/heads/*:refs/remotes/jrollins/*
53
54 [remote "dkg"]
55         url = http://lair.fifthhorseman.net/~dkg/git/monkeysphere.git/
56         fetch = +refs/heads/*:refs/remotes/dkg/*
57
58 [remote "mjgoins"] SEE: dkg, jrollins, etc.
59
60 [remote "micah"]
61         url = http://micah.riseup.net/git/monkeysphere.git
62         fetch = +refs/heads/*:refs/remotes/micah/*
63         
64 [remote "enw"]
65         url = http://lair.fifthhorseman.net/~enw/git/monkeysphere.git/
66         fetch = +refs/heads/*:refs/remotes/enw/*
67
68 [remote "rossg"]
69         url = http://lair.fifthhorseman.net/~rossg/git/monkeysphere.git/
70         fetch = +refs/heads/*:refs/remotes/rossg/*
71
72 [remote "greg"]
73         url = http://lair.fifthhorseman.net/~greg/git/monkeysphere.git/
74         fetch = +refs/heads/*:refs/remotes/greg/*
75         blood type = 
76
77 -----------------
78 [remote "upload"]
79         url = ssh://z.mlcastle.net/var/www/git/monkeysphere.git/
80         push = +refs/heads/*
81
82
83 $ git fetch dkg
84 $ git checkout master
85 $ git merge remotes/dkg/master
86 $ git push post
87
88
89
90
91
92
93
94 grunt's fingerprint: be:43:9c:03:9c:04:1a:97:7a:61:8a:fe:71:9d:6c:67
95 (grunt is lair.fifthhorseman.net)
96
97 for foo in $(git remote); do git fetch $foo; done
98
99
100
101 set mainfont {Arial 12}
102 set textfont { Courier 12}
103 set uifont {Arial 10 bold}
104 set tabstop 8
105 set findmergefiles 0
106 set maxgraphpct 50
107 set maxwidth 16
108 set cmitmode patch
109 set wrapcomment none
110 set showneartags 1
111 set showlocalchanges 1
112 set datetimeformat {%Y-%m-%d %H:%M:%S}
113 set limitdiffs 1
114 set bgcolor white
115 set fgcolor black
116 set colors {green red blue magenta darkgrey brown orange}
117 set diffcolors {red "#00a000" blue}
118 set diffcontext 3
119 set selectbgcolor gray85
120 set geometry(main) 1280x936+14+28
121 set geometry(topwidth) 1278
122 set geometry(topheight) 286
123 set geometry(pwsash0) "638 1"
124 set geometry(pwsash1) "903 1"
125 set geometry(botwidth) 1001
126 set geometry(botheight) 638
127 set permviews {}
128