Git development
 help / color / mirror / Atom feed
From: Martin Schlemmer <azarah@nosferatu.za.org>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Petr Baudis <pasky@ucw.cz>, git@vger.kernel.org
Subject: Re: [ANNOUNCE] git-pasky-0.7
Date: Sun, 24 Apr 2005 11:50:49 +0200	[thread overview]
Message-ID: <1114336249.27940.27.camel@nosferatu.lan> (raw)
In-Reply-To: <Pine.LNX.4.58.0504232044040.2344@ppc970.osdl.org>

[-- Attachment #1: Type: text/plain, Size: 494 bytes --]

On Sat, 2005-04-23 at 20:45 -0700, Linus Torvalds wrote:
> 
> 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.
> 

Thanks, thought it was something like this, but did not see a new
dependency in the README.


Thanks,

-- 
Martin Schlemmer


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

  reply	other threads:[~2005-04-24  9:42 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-04-24  0:59 [ANNOUNCE] git-pasky-0.7 Petr Baudis
2005-04-24  1:26 ` Martin Schlemmer
2005-04-24  3:45   ` Linus Torvalds
2005-04-24  9:50     ` Martin Schlemmer [this message]
2005-04-24  3:58 ` Paul Jackson
2005-04-24  4:17   ` James Purser
2005-04-24  4:35     ` Paul Jackson
2005-04-24  4:32   ` Daniel Barkalow
2005-04-24  4:50     ` Paul Jackson
2005-04-24  4:58       ` James Purser
2005-04-24  5:02     ` Paul Jackson
2005-04-24  5:11       ` Greg KH
2005-04-24  5:12       ` Daniel Barkalow
2005-04-24 10:35       ` Martin Schlemmer
2005-04-24  7:14   ` Petr Baudis
2005-04-24  7:20     ` Paul Jackson
2005-04-24 10:52 ` Junio C Hamano

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=1114336249.27940.27.camel@nosferatu.lan \
    --to=azarah@nosferatu.za.org \
    --cc=git@vger.kernel.org \
    --cc=pasky@ucw.cz \
    --cc=torvalds@osdl.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox