All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux@atomide.com, linux-arm-kernel@lists.infradead.org,
	linux-omap@vger.kernel.org
Subject: Re: [GIT PULL] omap fixes for 2.6.33-rc3
Date: Fri, 8 Jan 2010 10:22:37 -0800	[thread overview]
Message-ID: <20100108182236.GE6831@atomide.com> (raw)
In-Reply-To: <alpine.LFD.2.00.1001081014090.7821@localhost.localdomain>

* Linus Torvalds <torvalds@linux-foundation.org> [100108 10:18]:
> 
> 
> On Fri, 8 Jan 2010, Tony Lindgren wrote:
> > 
> > Please pull omap fixes from:
> > 
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus
> 
> No.
> 
> I don't know what the *** people have been doing in that tree, but it 
> looks like the _same_ branch was merged twice after rebasing:
> 
> 	Merge branch 'for_2_6_33_rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-2.6.33-rc3
> 	Merge branch 'for_2.6.33rc_b' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
> 
> This is why we don't rebase public trees, and I refuse to pull crap like 
> that. You need to teach the people you work with to not rebase, and the 
> only way I can say "stop" is by simply not pulling the crap.
> 
> There are other problems with that branch too - the "committer" 
> information is pure sh*t. It says "paul <paul@twilight.(none)>", so quite 
> frankly, somebody hasn't even read the very first chapter of just about 
> every single git documentation that is out there.
> 
> And now that I noticed, I see that the crap-for-brains committer info has 
> been going on for a long time, and I just hadn't looked closely enough 
> before. I didn't look closely enough to see if the rebase problem had also 
> happened before.

Yeah sorry, noticed the duplicate mess too. Will look into it.

Regards,

Tony

WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] omap fixes for 2.6.33-rc3
Date: Fri, 8 Jan 2010 10:22:37 -0800	[thread overview]
Message-ID: <20100108182236.GE6831@atomide.com> (raw)
In-Reply-To: <alpine.LFD.2.00.1001081014090.7821@localhost.localdomain>

* Linus Torvalds <torvalds@linux-foundation.org> [100108 10:18]:
> 
> 
> On Fri, 8 Jan 2010, Tony Lindgren wrote:
> > 
> > Please pull omap fixes from:
> > 
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus
> 
> No.
> 
> I don't know what the *** people have been doing in that tree, but it 
> looks like the _same_ branch was merged twice after rebasing:
> 
> 	Merge branch 'for_2_6_33_rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-2.6.33-rc3
> 	Merge branch 'for_2.6.33rc_b' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
> 
> This is why we don't rebase public trees, and I refuse to pull crap like 
> that. You need to teach the people you work with to not rebase, and the 
> only way I can say "stop" is by simply not pulling the crap.
> 
> There are other problems with that branch too - the "committer" 
> information is pure sh*t. It says "paul <paul@twilight.(none)>", so quite 
> frankly, somebody hasn't even read the very first chapter of just about 
> every single git documentation that is out there.
> 
> And now that I noticed, I see that the crap-for-brains committer info has 
> been going on for a long time, and I just hadn't looked closely enough 
> before. I didn't look closely enough to see if the rebase problem had also 
> happened before.

Yeah sorry, noticed the duplicate mess too. Will look into it.

Regards,

Tony

  reply	other threads:[~2010-01-08 18:22 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-08 18:09 [GIT PULL] omap fixes for 2.6.33-rc3 Tony Lindgren
2010-01-08 18:09 ` Tony Lindgren
2010-01-08 18:19 ` Linus Torvalds
2010-01-08 18:19   ` Linus Torvalds
2010-01-08 18:22   ` Tony Lindgren [this message]
2010-01-08 18:22     ` Tony Lindgren
2010-01-08 22:05     ` Paul Walmsley
2010-01-08 22:05       ` Paul Walmsley
2010-01-08 22:27       ` Tony Lindgren
2010-01-08 22:27         ` Tony Lindgren
2010-01-08 22:39         ` Linus Torvalds
2010-01-08 22:39           ` Linus Torvalds
2010-01-08 22:50           ` Tony Lindgren
2010-01-08 22:50             ` Tony Lindgren
2010-01-09  2:47             ` Stephen Rothwell
2010-01-09  2:47               ` Stephen Rothwell
2010-01-09 17:28               ` Tony Lindgren
2010-01-09 17:28                 ` Tony Lindgren
2010-01-08 18:20 ` Tony Lindgren
2010-01-08 18:20   ` Tony Lindgren

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=20100108182236.GE6831@atomide.com \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux@atomide.com \
    --cc=torvalds@linux-foundation.org \
    /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.