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

Re: Why the default action for pull is merge, but not rebase?

From
Joshua Jensen <jjensen@workspacewhiz.com>
Date
Oct 28, 2010, 02:53 UTC
Message-ID
<4CC8E5B5.7050404@workspacewhiz.com>
In-Reply-To
<4CC87DE6.9090604@nextest.com>
----- Original Message -----
From: Eric Raible
Date: 10/27/2010 1:30 PM
Show 9 quoted lines
> One frustrating aspect of branch.<name>.rebase is that AFAIK
> there's no way for it to preserve merges.
>
> I would much prefer if branch.<name>.rebase was allowed to
> specify the arguments to be passed to rebase:
>
> 	git config branch.mybranch.rebase "-i --preserve-merges"
>
> Anyone else see the value of something like this?

When --preserve-merges actually preserves the merges (perhaps the rebase-i-p branch is on the way to finishing this feature?? I couldn't get it to apply...), I would like this facility very much. By default, I think rebase *should* preserve merges, and the current flattening it does now should be an option.

Josh
Previous: Eric RaibleNext: Kevin Ballard
Message 9 of 13 in “Why the default action for pull is merge, but not rebase?”
  1. Eugene SajineOct 27, 2010
  2. Jonathan NiederOct 27, 2010
  3. Eugene SajineOct 27, 2010
  4. Jonathan NiederOct 27, 2010
  5. Björn SteinbrinkOct 28, 2010
  6. Eugene SajineOct 27, 2010
  7. Jonathan NiederOct 27, 2010
  8. Eric RaibleOct 27, 2010
  9. Joshua JensenOct 28, 2010
  10. Kevin BallardOct 28, 2010
  11. Eric RaibleOct 28, 2010
  12. Kevin BallardOct 28, 2010
  13. Stefan HallerOct 28, 2010

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.