summaryrefslogtreecommitdiff
path: root/43/a5e7e8e3f1bd9ad92c29a4bc8c63179ee63efd
blob: 7b31b3cc9e58ab8d475ac60dd547183fb0dde759 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193]
	helo=mx.sourceforge.net)
	by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76)
	(envelope-from <luke@dashjr.org>) id 1Sgbxl-00066A-Kn
	for bitcoin-development@lists.sourceforge.net;
	Mon, 18 Jun 2012 13:25:49 +0000
X-ACL-Warn: 
Received: from zinan.dashjr.org ([173.242.112.54])
	by sog-mx-3.v43.ch3.sourceforge.com with esmtp (Exim 4.76)
	id 1Sgbxh-0001vw-Lq for bitcoin-development@lists.sourceforge.net;
	Mon, 18 Jun 2012 13:25:49 +0000
Received: from ishibashi.localnet (unknown [97.96.85.141])
	(Authenticated sender: luke-jr)
	by zinan.dashjr.org (Postfix) with ESMTPSA id 65B8F56056B;
	Mon, 18 Jun 2012 13:25:37 +0000 (UTC)
From: "Luke-Jr" <luke@dashjr.org>
To: bitcoin-development@lists.sourceforge.net
Date: Mon, 18 Jun 2012 13:25:21 +0000
User-Agent: KMail/1.13.7 (Linux/3.4.0-gentoo-nestfix; KDE/4.8.1; x86_64; ; )
References: <CAD2Ti2_Z-mzHu_VG7fq+sgQj7CfdZ_nKoa7Q6nDObwBSL6yXgQ@mail.gmail.com>
	<201206180357.13430.luke@dashjr.org>
	<CAD2Ti29_NcLyfEB3b=Xur=Q37SP6Cn34b5ZzOTmucLdni3of=w@mail.gmail.com>
In-Reply-To: <CAD2Ti29_NcLyfEB3b=Xur=Q37SP6Cn34b5ZzOTmucLdni3of=w@mail.gmail.com>
X-PGP-Key-Fingerprint: E463 A93F 5F31 17EE DE6C 7316 BD02 9424 21F4 889F
X-PGP-Key-ID: BD02942421F4889F
X-PGP-Keyserver: hkp://pgp.mit.edu
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201206181325.23041.luke@dashjr.org>
X-Spam-Score: -0.0 (/)
X-Spam-Report: Spam Filtering performed by mx.sourceforge.net.
	See http://spamassassin.org/tag/ for more details.
	-0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay
	domain 0.0 AWL AWL: From: address is in the auto white-list
X-Headers-End: 1Sgbxh-0001vw-Lq
Subject: Re: [Bitcoin-development] 0.6.x - detachdb in wrong place
X-BeenThere: bitcoin-development@lists.sourceforge.net
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: <bitcoin-development.lists.sourceforge.net>
List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/bitcoin-development>,
	<mailto:bitcoin-development-request@lists.sourceforge.net?subject=unsubscribe>
List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=bitcoin-development>
List-Post: <mailto:bitcoin-development@lists.sourceforge.net>
List-Help: <mailto:bitcoin-development-request@lists.sourceforge.net?subject=help>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/bitcoin-development>,
	<mailto:bitcoin-development-request@lists.sourceforge.net?subject=subscribe>
X-List-Received-Date: Mon, 18 Jun 2012 13:25:49 -0000

On Monday, June 18, 2012 8:09:56 AM grarpamp wrote:
> > I guess I've been neglecting to update the stable repo with
> > releases tagged in master. It should be fixed now.
> 
> Yes, that has helped! Now git'ers can easily compare the release
> tags to stable 'x' branches on gitorious. I don't know how to do
> that across repos yet, save manuel diff of checkouts from each,
> which would have been required prior to this update you made.

This is the work model I use:
  git clone git://github.com/bitcoin/bitcoin.git
  cd bitcoin
  git remote add stable git://gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable.git
  git remote add personal git@github.com:YOURNAME/bitcoin.git

With this, you can use "git fetch --all" to update your copy of the remote
branches, and access them as "origin/master", "stable/0.6.x", etc; and push
personal branches using "git push personal <branch>"

Luke