From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan del Strother <maillist@steelskies.com>, git@vger.kernel.org
Subject: Re: [PATCH] Revert "Convert output messages in merge-recursive to past tense."
Date: Fri, 22 Aug 2008 16:03:46 -0700 [thread overview]
Message-ID: <20080822230346.GN3483@spearce.org> (raw)
In-Reply-To: <7v7ia87k2e.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> wrote:
> Jonathan del Strother <maillist@steelskies.com> writes:
>
> > Now that the progress meter is gone, merge messages make more sense when presented in present tense
> >
> > This reverts commit 89f40be294363ce4d14ed6931a65561a4e8e9140.
> >
> > Conflicts:
> >
> > builtin-merge-recursive.c
> > ---
>
> "Conflicts:"? Please either remove it or describe how you resolved the
> conflicts.
The conflicts are likely because this was run with git-revert and a
few hunks had to be manually merged. The result of the patch looks
fine to me. But the "Conflicts" part of the message is likely not
interesting here.
> Sign-off?
>
> The patch looked Ok to me. Shawn?
Acked-by: Shawn O. Pearce <spearce@spearce.org>
--
Shawn.
next prev parent reply other threads:[~2008-08-22 23:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-22 17:18 [PATCH] Revert "Convert output messages in merge-recursive to past tense." Jonathan del Strother
2008-08-22 22:37 ` Junio C Hamano
2008-08-22 23:03 ` Shawn O. Pearce [this message]
2008-08-23 12:13 ` Jonathan del Strother
2008-08-23 12:14 ` Jonathan del Strother
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=20080822230346.GN3483@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=maillist@steelskies.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.