git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Transfer notes when rebasing

From
John Keeping <john@keeping.me.uk>
Date
Sep 4, 2013, 07:59 UTC
Message-ID
<20130904075941.GA2582@serenity.lan>
In-Reply-To
<20130904075310.GB9637@sigill.intra.peff.net>
On Wed, Sep 04, 2013 at 03:53:10AM -0400, Jeff King wrote:
Show 13 quoted lines
> On Wed, Sep 04, 2013 at 09:51:26AM +0200, Francis Moreau wrote:
> 
> > When rebasing a branch which contains commits with notes onto another
> > branch it happens that some commits are already presents in the target
> > branch.
> > 
> > In that case git-rebase correctly drops those (already present)
> > commits but it also drops the notes associated with them.
> > 
> > Can the notes be transfered somehow in the target branch on the
> > already present commits ?
> 
> Yes, see the notes.rewriteRef config option to enable this.

Does that actually work for this case? It sounds like Francis has the notes copying correctly when commits are rewritten but the notes are not copied anywhere if the commit becomes empty.

I suspect it is difficult to do that in general as there is no clear way to know which commit those notes should be copied to.

Previous: Jeff KingNext: Francis Moreau
Message 3 of 7 in “Transfer notes when rebasing”
  1. Francis MoreauSep 4, 2013
  2. Jeff KingSep 4, 2013
  3. John KeepingSep 4, 2013
  4. Francis MoreauSep 4, 2013
  5. Jeff KingSep 4, 2013
  6. Francis MoreauSep 4, 2013
  7. Jeff KingSep 4, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.