From: Junio C Hamano <gitster@pobox.com>
To: jidanni@jidanni.org
Cc: git@vger.kernel.org
Subject: Re: Subject: [PATCH] Documentation/git-merge: deprecated syntax moved to end
Date: Thu, 01 Jan 2009 13:00:55 -0800 [thread overview]
Message-ID: <7vsko2hhbs.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: 87bpuqvpfz.fsf@jidanni.org
jidanni@jidanni.org writes:
> Moving the deprecated syntax moved to the end of the document.
> Or please at least stamp it *deprecated* in the SYNOPSIS, in case the
> user reads no further down the page.
To my mind, there is a difference between something being kept (and will
be kept for foreseeable future), and something being deprecated (and
eventual removal is at least contemplated). The original merge syntax
falls into the first category, and the current description is correct and
fine as-is.
The wording "for historical reasons" does not refer to the reason why the
second syntax is still kept. It merely refers to the reason why two
syntaxes exist in the first place.
prev parent reply other threads:[~2009-01-01 21:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-01 18:41 Subject: [PATCH] Documentation/git-merge: deprecated syntax moved to end jidanni
2009-01-01 21:00 ` Junio C Hamano [this message]
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=7vsko2hhbs.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jidanni@jidanni.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;
as well as URLs for NNTP newsgroup(s).