From: Jay Soffian <jaysoffian@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Sebastian Schuberth <sschuberth@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCHv2] doc: Clarify that "cherry-pick -x" does not use "git notes"
Date: Sat, 16 Apr 2011 13:11:04 -0400 [thread overview]
Message-ID: <BANLkTim2=Jg4QcgKwO=J6343zWAoCkyXZQ@mail.gmail.com> (raw)
In-Reply-To: <7vk4eub1g9.fsf@alter.siamese.dyndns.org>
On Sat, Apr 16, 2011 at 12:33 PM, Junio C Hamano <gitster@pobox.com> wrote:
> I suspect Jay had the recent CHERRY_PICK_HEAD series that lets you omit
> saying "-c <picked>" in mind.
Correct.
> We should not leave the cherry-picked from
> in such a case, I think, but the new code may be buggy.
Disagree. Here was my thought process (it was a conscious decision):
after conflict, when the user runs "git commit", the message is
brought up in the editor, leaving it up to the user to decide whether
it is appropriate to remove the "cherry-picked from" message. I
personally think it is correct to keept it, along with the list of
"Conflicts:". I understand some users think it's not appropriate to
keep the "cherry-picked from" message, but git should not force the
decision.
j.
next prev parent reply other threads:[~2011-04-16 17:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-15 7:43 [PATCH] doc: Use the term "remark" in "cherry-pick -x" to disambiguate from "git notes" Sebastian Schuberth
2011-04-15 17:12 ` Junio C Hamano
2011-04-15 17:53 ` [PATCHv2] doc: Clarify that "cherry-pick -x" does not use " Sebastian Schuberth
2011-04-15 22:22 ` Jay Soffian
2011-04-16 7:19 ` Sebastian Schuberth
2011-04-16 16:33 ` Junio C Hamano
2011-04-16 16:55 ` Sebastian Schuberth
2011-04-16 17:11 ` Jay Soffian [this message]
2011-04-16 17:42 ` Junio C Hamano
2011-04-17 2:39 ` Junio C Hamano
2011-04-17 7:20 ` Sebastian Schuberth
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='BANLkTim2=Jg4QcgKwO=J6343zWAoCkyXZQ@mail.gmail.com' \
--to=jaysoffian@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sschuberth@gmail.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).