git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
	Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>,
	Ramkumar Ramachandra <artagnon@gmail.com>,
	Christian Couder <chriscool@tuxfamily.org>,
	Thomas Rast <trast@inf.ethz.ch>
Subject: Re: [PATCH 1/3] cherry-pick: add support to copy notes
Date: Tue, 28 May 2013 21:41:48 -0500	[thread overview]
Message-ID: <51a56aec503d7_807b33e18998da@nysa.mail> (raw)
In-Reply-To: <7vobbv119k.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
> 
> > Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> > ---
> >  builtin/revert.c  |   2 +
> >  sequencer.c       | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
> >  sequencer.h       |   2 +
> >  t/t3500-cherry.sh |  32 +++++++++++++
> >  4 files changed, 169 insertions(+), 3 deletions(-)
> 
> "git cherry-pick" should help maintaining notes just like amend and
> rebase, but how should this interact with notes.rewrite.<command>,
> where the command is capable of doing this without an explicit
> option once you tell which notes need to be maintained?
> 
> Thomas Rast Cc'ed as he has been the primary force behind this line
> of "notes" usability.
> 
> It probably is not sensible to carry over note from a reverted
> commit to its revert, but I didn't immediately spot how the patch
> does this only for cherry-pick but not for revert (the codepath in
> do_pick_commit() is shared between them, no?).

The option is enabled from the UI, and only 'git cherry-pick' has the
--copy-notes option.

-- 
Felipe Contreras

  parent reply	other threads:[~2013-05-29  2:44 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-28 12:59 [PATCH 0/3] cherry-pick: improvments Felipe Contreras
2013-05-28 12:59 ` [PATCH 1/3] cherry-pick: add support to copy notes Felipe Contreras
2013-05-28 17:07   ` Junio C Hamano
2013-05-28 18:01     ` Thomas Rast
2013-05-29  2:46       ` Felipe Contreras
2013-05-29  8:09         ` Thomas Rast
2013-05-29  8:19           ` Felipe Contreras
2013-05-29  8:40             ` Thomas Rast
2013-05-29 11:18               ` Felipe Contreras
2013-05-29 11:34                 ` Thomas Rast
2013-05-29 11:56                   ` Felipe Contreras
2013-05-29 12:09               ` Ramkumar Ramachandra
2013-05-29 13:18                 ` Felipe Contreras
2013-05-29 13:48                   ` Ramkumar Ramachandra
2013-05-29 14:01                     ` Felipe Contreras
2013-05-29  2:41     ` Felipe Contreras [this message]
2013-05-28 12:59 ` [PATCH 2/3] revert/cherry-pick: add --quiet option Felipe Contreras
2013-05-28 12:59 ` [PATCH 3/3] revert/cherry-pick: add --skip option Felipe Contreras

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=51a56aec503d7_807b33e18998da@nysa.mail \
    --to=felipe.contreras@gmail.com \
    --cc=artagnon@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=trast@inf.ethz.ch \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).