From: Johannes Sixt <j6t@kdbg.org>
To: Marc Branchaud <marcnarc@xiplink.com>,
Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [ANNOUNCE] Git v2.11.0-rc3
Date: Thu, 24 Nov 2016 18:40:23 +0100 [thread overview]
Message-ID: <e14747cd-f3ab-a840-f743-c72a15989aa1@kdbg.org> (raw)
In-Reply-To: <836824f5-79e5-fbbf-dfe0-78cc19af1fb2@xiplink.com>
Am 24.11.2016 um 17:25 schrieb Marc Branchaud:
> On 2016-11-23 06:21 PM, Junio C Hamano wrote:
>>
>> * The original command line syntax for "git merge", which was "git
>> merge <msg> HEAD <parent>...", has been deprecated for quite some
>> time, and "git gui" was the last in-tree user of the syntax. This
>> is finally fixed, so that we can move forward with the deprecation.
>
> Is this still true, given j6t's recent patch at
>
> http://public-inbox.org/git/e61cc267-a59b-3be1-29db-c49d56f521f7@kdbg.org/T/
It is still true. The git-gui shipped with 2.11 does not depend on the
deprecated syntax. The deprecation can move forward.
In what ever way the regression will be fixed: we do not have to return
to the deprecated syntax.
-- Hannes
next prev parent reply other threads:[~2016-11-24 17:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-23 23:21 [ANNOUNCE] Git v2.11.0-rc3 Junio C Hamano
2016-11-24 16:25 ` Marc Branchaud
2016-11-24 17:40 ` Johannes Sixt [this message]
2016-11-24 16:59 ` [PATCH] Release note spelling and phrasing fixups Marc Branchaud
2016-11-28 23:56 ` Junio C Hamano
2016-11-29 9:57 ` [PATCH] RelNotes: typo fix in 2.11.0 notes Tobias Klauser
2016-11-29 18:35 ` Junio C Hamano
2016-11-29 18:50 ` Tobias Klauser
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=e14747cd-f3ab-a840-f743-c72a15989aa1@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=marcnarc@xiplink.com \
/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).