From: Stephen Warren <swarren@wwwdotorg.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] Custodian branch base commits
Date: Tue, 30 Oct 2012 12:55:06 -0600 [thread overview]
Message-ID: <5090228A.7090606@wwwdotorg.org> (raw)
In-Reply-To: <20121030185037.C20B22005D3@gemini.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.
next prev parent reply other threads:[~2012-10-30 18:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-30 17:35 [U-Boot] Custodian branch base commits Stephen Warren
2012-10-30 18:50 ` Wolfgang Denk
2012-10-30 18:55 ` Stephen Warren [this message]
2012-10-30 20:47 ` Wolfgang Denk
2012-10-30 21:10 ` Stephen Warren
2012-10-30 22:06 ` Wolfgang Denk
2012-10-30 22:20 ` Stephen Warren
2012-11-18 1:57 ` Jerry Van Baren
2012-10-30 21:19 ` Tom Rini
2012-10-31 16:56 ` Stephen Warren
2012-11-03 11:49 ` Albert ARIBAUD
2012-11-05 17:17 ` Stephen Warren
2012-11-05 19:39 ` Albert ARIBAUD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5090228A.7090606@wwwdotorg.org \
--to=swarren@wwwdotorg.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.