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

rebase --merge question

From
SSStijn Souffriau <stijn.souffriau@essensium.com>
Date
Mar 9, 2013, 15:15 UTC
Message-ID
<513B5204.7080000@essensium.com>
Hi all,
 From help rebase:
--merge
	Use merging strategies to rebase. When the recursive (default) merge 
strategy is used, this allows rebase to be aware of renames on the 
upstream side.

Renames of what? Files I assume. Are there any disadvantages compared to the normal rebase? If not, why isn't --merge the default behaviour.

Thanks,
Stijn
-- 
Stijn Souffriau
Embedded Software Developer - Mind Embedded Software Division

ESSENSIUM nv
Mind - Embedded Software Division
Gaston Geenslaan 9 - B-3001 Leuven
email : stijn.souffriau@essensium.com
Web: www.essensium.com   /   www.mind.be
BE 872 984 063 RPR Leuven
Message 1 of 1 in “rebase --merge question”
  1. Stijn SouffriauMar 9, 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.