git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: git@vger.kernel.org
Subject: Re: [ANNOUNCE] GIT 1.5.1
Date: Fri, 06 Apr 2007 09:24:43 +0200	[thread overview]
Message-ID: <vpq8xd6ge2s.fsf@bauges.imag.fr> (raw)
In-Reply-To: <7vlkh6kqk6.fsf@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Thu\, 05 Apr 2007 22\:41\:29 -0700")

Junio C Hamano <junkio@cox.net> writes:

> Soon after 1.5.0 was released, I think we said these two were
> not used in practice and declared them as deprecated.  So there
> is no "use this instead".

$ man git-resolve | grep -i 'use .* instead'
Reformatting git-resolve(1), please wait...
       DEPRECATED and will be removed in 1.5.1. Use git-merge instead.

;-)

-- 
Matthieu

  reply	other threads:[~2007-04-06  7:25 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-04-04  9:12 [ANNOUNCE] GIT 1.5.1 Junio C Hamano
2007-04-04  9:38 ` Andy Parkins
2007-04-04 10:16   ` Junio C Hamano
2007-04-04 11:09     ` Matthieu Moy
2007-04-06  5:41       ` Junio C Hamano
2007-04-06  7:24         ` Matthieu Moy [this message]
2007-04-04 18:26 ` A note from the maintainer Junio C Hamano
2007-05-20  9:54   ` 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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=vpq8xd6ge2s.fsf@bauges.imag.fr \
    --to=matthieu.moy@imag.fr \
    --cc=git@vger.kernel.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).