From: Sebastian Schuberth <sschuberth@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jay Soffian <jaysoffian@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCHv2] doc: Clarify that "cherry-pick -x" does not use "git notes"
Date: Sun, 17 Apr 2011 09:20:50 +0200 [thread overview]
Message-ID: <BANLkTink3uzx3xz5_pG6FmFctD_2W6HiCg@mail.gmail.com> (raw)
In-Reply-To: <7v39lhbnzj.fsf@alter.siamese.dyndns.org>
On Sun, Apr 17, 2011 at 04:39, Junio C Hamano <gitster@pobox.com> wrote:
> So to conclude,...
>
>>> + cherry-picked from. This is done only for cherry
>>> picks without conflicts. Do not use this option if
>>> you are cherry-picking from your private branch because
>>> the information is useless to the recipient. If on the
>
> ... we could just remove the "This is done only for cherry picks without
> conflicts." We could explain that the user may want to remove the line
> depending on the nature of the conflict resolution, but I guess it can
> be left without saying.
Still, I believe it would be more consistent to do this change as part
of the CHERRY_PICK_HEAD series itself, then.
--
Sebastian Schuberth
prev parent reply other threads:[~2011-04-17 7:21 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
2011-04-16 17:42 ` Junio C Hamano
2011-04-17 2:39 ` Junio C Hamano
2011-04-17 7:20 ` Sebastian Schuberth [this message]
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=BANLkTink3uzx3xz5_pG6FmFctD_2W6HiCg@mail.gmail.com \
--to=sschuberth@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jaysoffian@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).