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

Re: Git Notes - Track rebase/etc + reverse-lookup for bugs ideas

From
Johan Herland <johan@herland.net>
Date
Nov 10, 2008, 21:51 UTC
Message-ID
<200811102251.37044.johan@herland.net>
In-Reply-To
<20081110203437.GW24201@genesis.frugalware.org>
On Monday 10 November 2008, Miklos Vajna wrote:
> On Mon, Nov 10, 2008 at 09:01:15PM +0100, Johan Herland 
<johan@herland.net> wrote:
Show 7 quoted lines
> > Does it make sense to teach "git rebase" the -x option from "git
> > cherry-pick"? As with "git cherry-pick -x" it only makes sense to use
> > it if your rebasing from a public branch.
>
> But rebasing a public branch is always something we try to prevent. So
> basically -x would be useful only in case the user does what we asked
> not to do. ;-)

Sorry, I wasn't clear enough: I am talking about a copy-rebase, that is, the original public branch is unchanged, but you copy patches from it by making a local temporary branch that starts out in the same place and then rebasing it onto the other public branch where your want the patches to end up (followed by fast-forwarding the target branch and removing the temp branch). This is basically identical to cherry-picking a range of commits, but since "git cherry-pick" does not support cherry-picking a range of commits, this is the only alternative, AFAICS.

However, it would probably be a better solution to make "git cherry-pick" work on a commit range... (cf. the ongoing "multiple-commit cherry-pick" thread)

...Johan
-- 
Johan Herland, <johan@herland.net>
www.herland.net
Previous: Miklos VajnaNext: Johannes Schindelin
Message 7 of 10 in “Git Notes - Track rebase/etc + reverse-lookup for bugs ideas”
  1. Thomas HarningNov 10, 2008
  2. Jeff KingNov 10, 2008
  3. Johannes SchindelinNov 10, 2008
  4. Jeff KingNov 10, 2008
  5. Johan HerlandNov 10, 2008
  6. Miklos VajnaNov 10, 2008
  7. Johan HerlandNov 10, 2008
  8. Johannes SchindelinNov 10, 2008
  9. Thomas HarningNov 10, 2008
  10. Jeff KingNov 11, 2008

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.