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 branch -D master
git checkout -b
On 11/03/2012 05:49 AM, Albert ARIBAUD wrote:
Hi Stephen,
On Wed, 31 Oct 2012 10:56:08 -0600, Stephen Warren
swar...@wwwdotorg.org 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,
Hi Stephen,
On Mon, 05 Nov 2012 10:17:23 -0700, Stephen Warren
swar...@wwwdotorg.org wrote:
On 11/03/2012 05:49 AM, Albert ARIBAUD wrote:
Hi Stephen,
On Wed, 31 Oct 2012 10:56:08 -0600, Stephen Warren
swar...@wwwdotorg.org wrote:
Hopefully, u-boot-arm/master will merge in (or get
Hi Stephen,
On Wed, 31 Oct 2012 10:56:08 -0600, Stephen Warren
swar...@wwwdotorg.org 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
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 to sending a
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
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 supposed to
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 sequence be good for?
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-boot/master
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 command sequence be good for?
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 correct
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 exact git commands to
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/master
instead?
That would
13 matches
Mail list logo
