[U-Boot] Custodian branch base commits

Wolfgang Denk wd at denx.de
Tue Oct 30 21:47:45 CET 2012


Dear Stephen Warren,

In message <5090228A.7090606 at 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

Why don't you do just

	git branch -D master
	git checkout -b master u-boot/master

instead?

BTW - why are you doing this on the "master" branch?  Any other branch
name appears more appropriate to me for such work?

> 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.

standard git nomenclature? Do you happen to have a pointer for me?

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
What is mind?  No matter.  What is matter?  Never mind.
                                      -- Thomas Hewitt Key, 1799-1875


More information about the U-Boot mailing list