threads / discuss / 33117

rebase --merge question

Subject: rebase --merge question

## tl;dr

One message between Mar 9, 2013 and Mar 9, 2013.

replies: 0people: 1as markdown or json

Stijn Souffriau· Mar 9, 2013, 15:15 UTC · lore
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

← back to recent threads