From: Junio C Hamano <gitster@pobox.com>
To: Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Cc: Stephen Morton <stephen.morton@nokia.com>,
Christian Couder <christian.couder@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Jeff King <peff@peff.net>, Stefan Beller <sbeller@google.com>,
git@vger.kernel.org
Subject: Re: git cherry-pick conflict error message is deceptive when cherry-picking multiple commits
Date: Wed, 17 Aug 2016 08:31:43 -0700 [thread overview]
Message-ID: <xmqqa8gbbee8.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1592315356.1230893.1471443850115.JavaMail.zimbra@ensimag.grenoble-inp.fr> (Remi Galan Alfonso's message of "Wed, 17 Aug 2016 16:24:10 +0200 (CEST)")
Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
writes:
> Either way (3 or 4 lines) I find it strange to have both advices
> start in the same way except that one is split and not the other.
True.
next prev parent reply other threads:[~2016-08-17 15:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-10 19:21 git cherry-pick conflict error message is deceptive when cherry-picking multiple commits Stephen Morton
2016-08-14 11:44 ` Christian Couder
2016-08-17 13:42 ` Stephen Morton
2016-08-17 14:24 ` Remi Galan Alfonso
2016-08-17 15:31 ` Junio C Hamano [this message]
2016-08-18 14:15 ` Johannes Schindelin
2016-08-16 8:44 ` Remi Galan Alfonso
2016-08-17 9:13 ` Johannes Schindelin
-- strict thread matches above, loose matches on Subject: below --
2016-07-26 19:40 Stephen Morton
2016-07-26 20:18 ` Stefan Beller
2016-07-26 20:30 ` Jeff King
2016-07-26 20:44 ` Stephen Morton
2016-07-27 14:15 ` Stephen Morton
2016-07-27 15:03 ` Johannes Schindelin
2016-07-27 15:30 ` Stephen Morton
2016-08-01 9:12 ` Johannes Schindelin
2016-08-10 19:14 ` Stephen Morton
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=xmqqa8gbbee8.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=remi.galan-alfonso@ensimag.grenoble-inp.fr \
--cc=sbeller@google.com \
--cc=stephen.morton@nokia.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.