X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient: geda-user AT delorie DOT com
X-Original-DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=mail.ud03.udmedia.de; h=
	subject:to:references:from:message-id:date:mime-version
	:in-reply-to:content-type:content-transfer-encoding; s=beta; bh=
	Lf3DEU4Dc077kTSpUMMnkA3Wi7AWpgfLFVpRtxEBVoA=; b=MEW9SPuSmD78OexP
	D3pK7RZSMUB1qbCCqjI4mFdre5qjEGmaYuUPyy2E79Q73aP6sByISwuN/c4QRbvr
	7JpmWQ+vRDUdBvip5ecB1v4JLZ8iRjBDDaYlM9889YvCRWe6CJ0SXDYlOZynBh/M
	UA81sHBhCJ0KYF8aoMNMqDKeAdo=
Subject: Re: [geda-user] New experimental netlist features
To: geda-user AT delorie DOT com
References: <alpine DOT DEB DOT 2 DOT 11 DOT 1509031356150 DOT 13201 AT nimbus>
 <55E8773B DOT 9000902 AT jump-ing DOT de> <alpine DOT DEB DOT 2 DOT 11 DOT 1509031846370 DOT 7163 AT nimbus>
 <55E8831A DOT 8050307 AT jump-ing DOT de> <alpine DOT DEB DOT 2 DOT 11 DOT 1509032004020 DOT 10628 AT nimbus>
 <55E891FA DOT 2010509 AT jump-ing DOT de> <alpine DOT DEB DOT 2 DOT 11 DOT 1509032039300 DOT 14871 AT nimbus>
From: "Markus Hitter (mah AT jump-ing DOT de) [via geda-user AT delorie DOT com]" <geda-user AT delorie DOT com>
Message-ID: <55E8AE6C.2090304@jump-ing.de>
Date: Thu, 3 Sep 2015 22:32:44 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
 Thunderbird/38.2.0
MIME-Version: 1.0
In-Reply-To: <alpine.DEB.2.11.1509032039300.14871@nimbus>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Reply-To: geda-user AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: geda-user AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com
Precedence: bulk

Am 03.09.2015 um 20:44 schrieb Roland Lutz:

> I have very limited time right now, but I will see if I can at least
> merge Xorn into the main gEDA repository tomorrow morning.

Can't you just push it as a branch? It doesn't matter how long the branch is.

The easiest way to join two repos is to add both remotes. Assuming you have remote 'origin' pointing to Github, you'd do this:

  git remote add geda ssh://git AT git DOT geda-project DOT org:65/geda-gaf
  git fetch geda

Voilá, joined. 'gitk --all' will show both remotes and also where these two parted. Then you can push your branches the usual way to the other remote repo:

  git push geda <branch>

That's all. Rebasing/merging/whatever can be done later.

If you don't have sufficient privileges in the gEDA repo, let me know. If you have no account there at all, please send me your SSH public key along with a preferred user name.


Cheers,
Markus

-- 
- - - - - - - - - - - - - - - - - - -
Dipl. Ing. (FH) Markus Hitter
http://www.jump-ing.de/