From: Felipe Contreras Date: Wed, 29 May 2013 02:41:48 GMT Subject: Re: [PATCH 1/3] cherry-pick: add support to copy notes Message-ID: <51a56aec503d7_807b33e18998da@nysa.mail> In-Reply-To: <7vobbv119k.fsf@alter.siamese.dyndns.org> Junio C Hamano wrote: > Felipe Contreras writes: > > > Signed-off-by: Felipe Contreras > > --- > > 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., > 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