[U-Boot] Custodian branch base commits
Stephen Warren
swarren at wwwdotorg.org
Tue Oct 30 22:10:20 CET 2012
On 10/30/2012 02:47 PM, Wolfgang Denk wrote:
> 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?
That would work identically. The exact git commands to do this really
aren't the point of this conversation.
> BTW - why are you doing this on the "master" branch? Any other branch
> name appears more appropriate to me for such work?
Well, the U-Boot wiki tells all custodians to use a branch named master,
and all the custodian repos I've needed to look at follow this convention.
>> 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?
http://git-scm.com/book/ch3-5.html
First sentence of the second paragraph in the body text.
More information about the U-Boot
mailing list