From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Warren <swarren@wwwdotorg.org>
Date: Tue, 30 Oct 2012 12:55:06 -0600
Subject: [U-Boot] Custodian branch base commits
In-Reply-To: <20121030185037.C20B22005D3@gemini.denx.de>
References: <50900FED.6040508@wwwdotorg.org>
	<20121030185037.C20B22005D3@gemini.denx.de>
Message-ID: <5090228A.7090606@wwwdotorg.org>
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 10/30/2012 12:50 PM, Wolfgang Denk wrote:
> Dear Stephen Warren,
> 
> In message <50900FED.6040508@wwwdotorg.org> you wrote:
>>
>> # (in u-boot-tegra.git, assuming everything is merged already)
>> git checkout master
>> git reset --hard u-boot/master
> 
> What would this specific command sequence be good for? [And what
> exactly is "u-boot/master" supposed to be?]

Starting a new branch of development from something in the upstream
repository. Here's we're re-using existing branch name "master" for the
new branch, hence "git reset" rather than "git checkout -b". Resetting
the branch and essentially starting from scratch means creating much
less of a rats-nest of merges in downstream repos.

u-boot/master is the standard git nomenclature for remote u-boot
(assumed to point at git://git.denx.de/u-boot.git) branch master.