Re: Re* Regulator updates for 3.3

From: Phil Hord <phil.hord@gmail.com>
Date: Jan 11, 2012, 16:14 UTC
Message-ID: <CABURp0qwjNmHtgkCqdsOk7+_isbpGB6S43WudRgbvE4xnvGUOg@mail.gmail.com>
In-Reply-To: <7vzkdu7miv.fsf@alter.siamese.dyndns.org>

On Wed, Jan 11, 2012 at 1:59 AM, Junio C Hamano <gitster@pobox.com> wrote: [...]

Show 14 quoted lines

>
> With that caveat, the patch should look like this.
>
> -- >8 --
> Subject: [PATCH] merge: use editor by default in interactive sessions
>
> Traditionally, a cleanly resolved merge was committed by "git merge" using
> the auto-generated merge commit log message with invoking the editor.
>
> After 5 years of use in the field, it turns out that many people perform
> too many unjustified backmerges of the upstream history into their topic
> branches. These merges are not just useless, but they are more often than
> not explained and making the end result unreadable when it gets time for
> merging their history back to their upstream.

Typo, I think. I believe you meant "they are more often than not not explained", but as this is unclear, maybe you can use "they are usually not explained" or "they more often than not go in without explanation".