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

Re: [ANNOUNCE] git-pasky-0.7

From
Linus Torvalds <torvalds@osdl.org>
Date
Apr 24, 2005, 03:45 UTC
Message-ID
<Pine.LNX.4.58.0504232044040.2344@ppc970.osdl.org>
In-Reply-To
<1114306009.27940.23.camel@nosferatu.lan>
On Sun, 24 Apr 2005, Martin Schlemmer wrote:
> 
> Over here gitmerge-file.sh is looking for a 'merge' command not present.

It's usually packaged up with RCS. So in that sense git does need RCS, although it's really only the traditional three-way merge program it wants.

Do "yum install rcs" and you should get it (or whatever your local alternative is).

		Linus
Previous: Martin SchlemmerNext: Martin Schlemmer
Message 3 of 17 in “[ANNOUNCE] git-pasky-0.7”
  1. Petr BaudisApr 24, 2005
  2. Martin SchlemmerApr 24, 2005
  3. Linus TorvaldsApr 24, 2005
  4. Martin SchlemmerApr 24, 2005
  5. Paul JacksonApr 24, 2005
  6. James PurserApr 24, 2005
  7. Paul JacksonApr 24, 2005
  8. Daniel BarkalowApr 24, 2005
  9. Paul JacksonApr 24, 2005
  10. James PurserApr 24, 2005
  11. Paul JacksonApr 24, 2005
  12. Greg KHApr 24, 2005
  13. Daniel BarkalowApr 24, 2005
  14. Martin SchlemmerApr 24, 2005
  15. Petr BaudisApr 24, 2005
  16. Paul JacksonApr 24, 2005
  17. Junio C HamanoApr 24, 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.