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

Re: What's the best method between merging and rebasing ?

From
Johannes Sixt <j.sixt@eudaptics.com>
Date
Mar 12, 2007, 17:11 UTC
Message-ID
<45F589BF.28E3A5AD@eudaptics.com>
In-Reply-To
<200703121634.l2CGYtGx027263@localhost.localdomain>
Xavier Maillard wrote:
> -> D -> E -> F -> several commits from old master -> HEAD (of new master)
> 
> So it seems to be cherry-picks + rebase master on new HEAD but I
> am not sure at how things are doing :)

Just to get the wording straight: You mean "reset master to new HEAD", not "rebase". "reset" means to point the branch identifier ("master") to some commit - with or without modifying the working directory accordingly. OTOH, "rebase" means to re-apply a string of commits on top of some other commit.

-- Hannes
Previous: Xavier MaillardNext: Pierre Habouzit
Message 4 of 8 in “What's the best method between merging and rebasing ?”
  1. Xavier MaillardMar 12, 2007
  2. Pierre HabouzitMar 12, 2007
  3. Xavier MaillardMar 12, 2007
  4. Johannes SixtMar 12, 2007
  5. Pierre HabouzitMar 12, 2007
  6. Pierre HabouzitMar 12, 2007
  7. Xavier MaillardMar 12, 2007
  8. Pierre HabouzitMar 12, 2007

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.