From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: Ralf Thielow <ralf.thielow@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Git List <git@vger.kernel.org>
Subject: Re: [PATCH] sequencer.c: abbreviate hashs placed in the middle of messages
Date: Sun, 10 May 2015 11:05:41 +0200 [thread overview]
Message-ID: <vpqwq0g2462.fsf@anie.imag.fr> (raw)
In-Reply-To: <xmqqa8xekeb2.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Fri, 08 May 2015 13:24:49 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> I am not sure how that changes anything.
>
> $ git cherry-pick 38e70713119c25ab5699df6b2fb13e4133d399ab
> error: that commit is a merge and you didn't give me -m <which-parent>
>
> $ git cherry-pick 38e70713119c25ab5699df6b2fb13e4133d399ab
> error: the commit 38e707... is a merge and you didn't give me -m <which-parent>
But ...
./myscript.sh
error: that commit is a merge and you didn't give me -m <which-parent>
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2015-05-10 9:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-08 16:53 [PATCH] sequencer.c: abbreviate hashs placed in the middle of messages Ralf Thielow
2015-05-08 17:10 ` Eric Sunshine
2015-05-08 17:20 ` Ralf Thielow
2015-05-08 17:20 ` Junio C Hamano
2015-05-08 17:26 ` Ralf Thielow
2015-05-08 17:31 ` Junio C Hamano
2015-05-08 17:58 ` Ralf Thielow
2015-05-08 18:42 ` Junio C Hamano
2015-05-08 19:56 ` Ralf Thielow
2015-05-08 20:24 ` Junio C Hamano
2015-05-08 20:57 ` Ralf Thielow
2015-05-10 9:05 ` Matthieu Moy [this message]
2015-05-10 19:17 ` Junio C Hamano
2015-05-10 19:36 ` Matthieu Moy
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=vpqwq0g2462.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ralf.thielow@gmail.com \
--cc=sunshine@sunshineco.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).