From mboxrd@z Thu Jan  1 00:00:00 1970
From: Laurence Withers <lwithers@guralp.com>
Date: Tue, 25 Oct 2011 15:52:38 +0000
Subject: [U-Boot] Syncing custodian tree (the new way) - What am I doing
 wrong?
In-Reply-To: <4EA69E45.4020109@gmail.com>
References: <4EA66869.7000106@gmail.com>
	<20111025075325.CBE8C1408EA7@gemini.denx.de>
	<4EA6980D.8010806@free.fr> <4EA69E45.4020109@gmail.com>
Message-ID: <20111025155238.GA28867@guralp.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On Tue, Oct 25, 2011 at 10:32:21PM +1100, Graeme Russ wrote:
> git checkout master
> git rebase ${upstream}/master
> 
> But that is not right - I would normally rebase to uboot
> 
> I think there is a missing link here somewhere

${upstream}/master needs to correspond to a remote tracking branch. Do you
have a remote named after ${upstream} ? ("git remote" prints them, "git
remote add <name> <url>" adds them). I think that might be the missing
link.

Quite often you'll have a remote called origin since that is created
automatically and points at the URL you cloned from. I guess a "normal"
workflow would be:

git checkout <local-branch>
git fetch <remote>
git rebase <remote>/master

Bye for now,
-- 
Laurence Withers, <lwithers@guralp.com>                http://www.guralp.com/
Direct tel:+447753988197 or tel:+443333408643               Software Engineer
General support queries: <support@guralp.com>         CMG-DCM CMG-EAM CMG-NAM