From: "René Scharfe" <l.s.r@web.de>
To: "Michael S. Tsirkin" <mst@redhat.com>, git@vger.kernel.org
Subject: Re: [PATCH RFC] git-am: support any number of signatures
Date: Thu, 12 Jun 2014 21:25:54 +0200 [thread overview]
Message-ID: <5399FEC2.3020309@web.de> (raw)
In-Reply-To: <1402589505-27632-1-git-send-email-mst@redhat.com>
Am 12.06.2014 18:12, schrieb Michael S. Tsirkin:
> @@ -136,7 +136,7 @@ fall_back_3way () {
> eval "$cmd" &&
> GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
> git write-tree >"$dotest/patch-merge-base+" ||
> - cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")"
> + cannot_fallback "$(gettext "Repository lsignoffs necessary blobs to fall back on 3-way merge.")"
lsignoffs?
next prev parent reply other threads:[~2014-06-12 19:26 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-12 16:12 [PATCH RFC] git-am: support any number of signatures Michael S. Tsirkin
2014-06-12 19:07 ` Junio C Hamano
2014-06-13 8:00 ` Michael S. Tsirkin
2014-06-13 17:32 ` Junio C Hamano
2014-06-15 10:27 ` Michael S. Tsirkin
2014-06-16 18:06 ` Junio C Hamano
2014-06-18 3:09 ` Michael S. Tsirkin
2014-06-18 6:49 ` Junio C Hamano
2014-06-18 7:33 ` Michael S. Tsirkin
2014-06-18 17:51 ` Junio C Hamano
2014-06-18 18:23 ` Michael S. Tsirkin
2014-09-22 14:01 ` Michael S. Tsirkin
2014-09-22 17:58 ` Junio C Hamano
2014-09-23 7:45 ` Christian Couder
2014-09-23 8:07 ` Michael S. Tsirkin
2014-09-24 10:00 ` Christian Couder
2014-10-07 21:33 ` Michael S. Tsirkin
2014-09-23 17:15 ` Junio C Hamano
2014-09-25 5:04 ` Junio C Hamano
2014-09-25 10:04 ` Christian Couder
2014-09-25 16:20 ` Junio C Hamano
2014-09-28 11:36 ` Christian Couder
[not found] ` <7viok7k0c0.fsf@alter.siamese.dyndns.org>
2014-10-12 9:36 ` Christian Couder
2014-10-13 5:09 ` Christian Couder
2014-10-13 22:05 ` Junio C Hamano
2014-10-14 5:29 ` Christian Couder
2014-10-07 21:29 ` Michael S. Tsirkin
2014-10-07 21:39 ` Jeff King
2014-10-07 21:41 ` Junio C Hamano
2014-06-12 19:25 ` René Scharfe [this message]
2014-06-13 8:01 ` Michael S. Tsirkin
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=5399FEC2.3020309@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=mst@redhat.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 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).