Skip to contentSkip to conversation

rebase --merge question

DISCUSSION Stijn Souffriau 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

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

Signature · 9 lines
Stijn Souffriau
Embedded Software Developer - Mind Embedded Software Division

ESSENSIUM nv
Mind - Embedded Software Division
Gaston Geenslaan 9 - B-3001 Leuven
email : [email protected]
Web: www.essensium.com   /   www.mind.be
BE 872 984 063 RPR Leuven