public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Ben Warren <biggerbadderben@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] minor debug cleanups in ./net
Date: Thu, 06 Aug 2009 13:04:41 -0700	[thread overview]
Message-ID: <4A7B3759.3030809@gmail.com> (raw)
In-Reply-To: <200908061557.30782.rgetz@blackfin.uclinux.org>

Robin Getz wrote:
> On Thu 6 Aug 2009 15:40, Wolfgang Denk pondered:
>   
>> Dear Robin Getz,
>>
>> In message <200908061427.10961.rgetz@blackfin.uclinux.org> you wrote:
>>     
>>> On Thu 23 Jul 2009 03:01, Robin Getz pondered:
>>>       
>>>> OK - this is on 
>>>>
>>>> git remote -v
>>>> origin  git://git.denx.de/u-boot-net.git
>>>>
>>>> git log --max-count=1
>>>> commit 97cfe86163505ea18e7ff7b71e78df5bb03dad57
>>>>
>>>> (Is there a better way to tell if git is up to date?)
>>>>         
>>> Was there any problems with this one?
>>>       
>> Well, "git describe" needs less typing, and gives better information.
>>     
>
> Thanks for the tip.
>
> rgetz at pinky:~/blackfin/mainline/u-boot/master> git remote -v
> origin  git://git.denx.de/u-boot.git
> rgetz at pinky:~/blackfin/mainline/u-boot/master> git describe --all HEAD^
> warning: tag 'v2009.08-rc1' is really 'tags/v2009.08-rc1' here
> v2009.08-rc1-29-gc3fa4f0
>
> when I switch to the net tree, I get:
>
> rgetz at pinky:~/blackfin/mainline/u-boot/net> git remote -v
> origin  git://git.denx.de/u-boot-net.git
> rgetz at pinky:~/blackfin/mainline/u-boot/net> git describe --all HEAD^
> warning: tag 'U-Boot-1_2_0' is really 'tags/U-Boot-1_2_0' here
> U-Boot-1_2_0-6291-g0b23fb3
>
> That is because Ben hasn't done a git pull from the master since U-Boot-1_2_0? Or have I don't something wrong on my end?
>
> -robin
>   
I never pull from the master, but follow the workflow described here:

http://www.denx.de/wiki/U-Boot/CustodianGitTrees

I have a local 'u-boot' branch that pulls from the master, then re-base 
the net branch to that one.  I'm very far from being a git master, but 
thus far I've never seen problems.

regards,
Ben

  reply	other threads:[~2009-08-06 20:04 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-22 22:56 [U-Boot] minor debug cleanups in ./net Robin Getz
2009-07-23  6:27 ` Ben Warren
2009-07-23  7:01   ` Robin Getz
2009-08-06 18:27     ` Robin Getz
2009-08-06 18:52       ` Ben Warren
2009-08-06 19:40       ` Wolfgang Denk
2009-08-06 19:57         ` Robin Getz
2009-08-06 20:04           ` Ben Warren [this message]
2009-08-06 22:22           ` Wolfgang Denk

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=4A7B3759.3030809@gmail.com \
    --to=biggerbadderben@gmail.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox