Re: [U-Boot] Custodian branch base commits

2012-11-17 Thread Jerry Van Baren
On 10/30/2012 06:20 PM, Stephen Warren wrote: > On 10/30/2012 04:06 PM, Wolfgang Denk wrote: >> Dear Stephen Warren, >> >> In message <5090423c.5070...@wwwdotorg.org> you wrote: >>> >>> git checkout master >>> git reset --hard u-boot/master >> ... Why don't you do just git bran

Re: [U-Boot] Custodian branch base commits

2012-11-05 Thread Albert ARIBAUD
Hi Stephen, On Mon, 05 Nov 2012 10:17:23 -0700, Stephen Warren wrote: > On 11/03/2012 05:49 AM, Albert ARIBAUD wrote: > > Hi Stephen, > > > > On Wed, 31 Oct 2012 10:56:08 -0600, Stephen Warren > > wrote: > > > Hopefully, u-boot-arm/master will merge in (or get reset to) > u-boot/ma

Re: [U-Boot] Custodian branch base commits

2012-11-05 Thread Stephen Warren
On 11/03/2012 05:49 AM, Albert ARIBAUD wrote: > Hi Stephen, > > On Wed, 31 Oct 2012 10:56:08 -0600, Stephen Warren > wrote: > Hopefully, u-boot-arm/master will merge in (or get reset to) u-boot/master fairly shortly. However, should Tegra's repo have to wait for this? >>> >>> Yes

Re: [U-Boot] Custodian branch base commits

2012-11-03 Thread Albert ARIBAUD
Hi Stephen, On Wed, 31 Oct 2012 10:56:08 -0600, Stephen Warren wrote: > >> Hopefully, u-boot-arm/master will merge in (or get reset to) > >> u-boot/master fairly shortly. However, should Tegra's repo have > >> to wait for this? > > > > Yes, tegra has to wait otherwise you've just forced u-boot

Re: [U-Boot] Custodian branch base commits

2012-10-31 Thread Stephen Warren
On 10/30/2012 03:19 PM, Tom Rini wrote: > On Tue, Oct 30, 2012 at 11:35:41AM -0600, Stephen Warren wrote: > >> The instructions at: >> >> http://www.denx.de/wiki/U-Boot/CustodianGitTrees >> >> ... indicate that downstream branches should be rebased onto >> ${upstream}/master immediately prior t

Re: [U-Boot] Custodian branch base commits

2012-10-30 Thread Stephen Warren
On 10/30/2012 04:06 PM, Wolfgang Denk wrote: > Dear Stephen Warren, > > In message <5090423c.5070...@wwwdotorg.org> you wrote: >> >> git checkout master >> git reset --hard u-boot/master > ... >>> Why don't you do just >>> git branch -D master >>> git checkout -b master u-boot/mast

Re: [U-Boot] Custodian branch base commits

2012-10-30 Thread Wolfgang Denk
Dear Stephen Warren, In message <5090423c.5070...@wwwdotorg.org> you wrote: > > git checkout master > git reset --hard u-boot/master ... > > Why don't you do just > > git branch -D master > > git checkout -b master u-boot/master > > instead? > > That would work identically. The

Re: [U-Boot] Custodian branch base commits

2012-10-30 Thread Tom Rini
On Tue, Oct 30, 2012 at 11:35:41AM -0600, Stephen Warren wrote: > The instructions at: > > http://www.denx.de/wiki/U-Boot/CustodianGitTrees > > ... indicate that downstream branches should be rebased onto > ${upstream}/master immediately prior to sending a pull request. I'm not > sure this is co

Re: [U-Boot] Custodian branch base commits

2012-10-30 Thread Stephen Warren
On 10/30/2012 02:47 PM, Wolfgang Denk wrote: > Dear Stephen Warren, > > In message <5090228a.7090...@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 comman

Re: [U-Boot] Custodian branch base commits

2012-10-30 Thread Wolfgang Denk
Dear Stephen Warren, In message <5090228a.7090...@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

Re: [U-Boot] Custodian branch base commits

2012-10-30 Thread Stephen Warren
On 10/30/2012 12:50 PM, Wolfgang Denk wrote: > Dear Stephen Warren, > > In message <50900fed.6040...@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 sequenc

Re: [U-Boot] Custodian branch base commits

2012-10-30 Thread Wolfgang Denk
Dear Stephen Warren, In message <50900fed.6040...@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" suppos

[U-Boot] Custodian branch base commits

2012-10-30 Thread Stephen Warren
The instructions at: http://www.denx.de/wiki/U-Boot/CustodianGitTrees ... indicate that downstream branches should be rebased onto ${upstream}/master immediately prior to sending a pull request. I'm not sure this is correct any more, given that upstream master branches now pull in downstream bran