git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: SCSI trees, merges and git status

From
Linus Torvalds <torvalds@osdl.org>
Date
Apr 19, 2005, 03:04 UTC
Message-ID
<Pine.LNX.4.58.0504182003480.15725@ppc970.osdl.org>
In-Reply-To
<1113877071.4998.111.camel@mulgrave>
On Mon, 18 Apr 2005, James Bottomley wrote:
> 
> Fair enough.  If you pull from
> 
> rsync://www.parisc-linux.org/~jejb/scsi-misc-2.6.git
Thanks. Pulled and pushed out.
Show 6 quoted lines
> Doing this exposed two bugs in your merge script:
> 
> 1) It doesn't like a completely new directory (the misc tree contains a
> new drivers/scsi/lpfc)
> 2) the merge testing logic is wrong.  You only want to exit 1 if the
> merge fails.
Applied.
		Linus
Previous: James BottomleyNext: Junio C Hamano
Message 11 of 13 in “SCSI trees, merges and git status”
  1. James BottomleyApr 18, 2005
  2. Linus TorvaldsApr 18, 2005
  3. James BottomleyApr 18, 2005
  4. Linus TorvaldsApr 19, 2005
  5. David WoodhouseApr 19, 2005
  6. James BottomleyApr 19, 2005
  7. David WoodhouseApr 19, 2005
  8. James BottomleyApr 19, 2005
  9. Linus TorvaldsApr 19, 2005
  10. James BottomleyApr 19, 2005
  11. Linus TorvaldsApr 19, 2005
  12. Junio C HamanoApr 18, 2005
  13. Petr BaudisApr 18, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.