From: Junio C Hamano <gitster@pobox.com>
To: Johan Herland <johan@herland.net>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [ANNOUNCE] Git 1.7.4-rc1
Date: Mon, 10 Jan 2011 09:11:30 -0800 [thread overview]
Message-ID: <7v1v4k7kfx.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <201101100221.34077.johan@herland.net> (Johan Herland's message of "Mon\, 10 Jan 2011 02\:21\:33 +0100")
Johan Herland <johan@herland.net> writes:
> I can't find "git merge --abort" and "git notes merge" in this list.
> Suggested paragraphs:
>
> * "git merge" learned "--abort" option, synonymous to
> "git reset --merge" when a merge is in progress.
>
> * "git notes" learned the "merge" subcommand to merge notes refs.
> In addition to the default manual conflict resolution, there are
> also several notes merge strategies for automatically resolving
> notes merge conflicts.
Thanks.
next prev parent reply other threads:[~2011-01-10 17:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-06 0:54 [ANNOUNCE] Git 1.7.4-rc1 Junio C Hamano
[not found] ` <201101100221.34077.johan@herland.net>
2011-01-10 17:11 ` Junio C Hamano [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-01-10 10:51 Johan Herland
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=7v1v4k7kfx.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=johan@herland.net \
/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).