Re: [ANNOUNCE] Git 1.7.4-rc1

From: Johan Herland <johan@herland.net>
Date: Jan 10, 2011, 10:51 UTC
Message-ID: <201101101151.08181.johan@herland.net>

On Thursday 06 January 2011, Junio C Hamano wrote:

> A release candidate Git 1.7.4-rc1 is available at the usual places
> for testing:

[...]

Show 5 quoted lines

> Git v1.7.4 Release Notes (draft)
> ================================
> 
> Updates since v1.7.3
> --------------------

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.

Have fun! :)

...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net