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

Re: [RFC] Merge strategy 'applyreject'

From
Petr Baudis <pasky@suse.cz>
Date
Sep 13, 2006, 21:50 UTC
Message-ID
<20060913215049.GP18896@pasky.or.cz>
In-Reply-To
<7v1wqf789j.fsf@assigned-by-dhcp.cox.net>

Dear diary, on Wed, Sep 13, 2006 at 11:43:04PM CEST, I got a letter where Junio C Hamano <junkio@cox.net> said that...

> Petr Baudis <pasky@suse.cz> writes:
> > .rej files, what a nuisance to handle those... :)
> 
> You were who asked for "apply --reject", weren't you?

Yes, but the point of that was obviously different. (It's a nuisance, but only when compared to the conflict markers (yes, a matter of opinion of course).)

Thanks for it, BTW!
-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Snow falling on Perl. White noise covering line noise.
Hides all the bugs too. -- J. Putnam
Previous: Shawn PearceNext: Shawn Pearce
Message 7 of 10 in “[RFC] Merge strategy 'applyreject'”
  1. Shawn PearceSep 13, 2006
  2. Petr BaudisSep 13, 2006
  3. Junio C HamanoSep 13, 2006
  4. Shawn PearceSep 13, 2006
  5. Jakub NarebskiSep 13, 2006
  6. Shawn PearceSep 13, 2006
  7. Petr BaudisSep 13, 2006
  8. Shawn PearceSep 13, 2006
  9. Jakub NarebskiSep 13, 2006
  10. Shawn PearceSep 13, 2006

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.