Subject: rebase --merge question

From: Stijn Souffriau <[email-masked]>
Date: Sat, 09 Mar 2013 16:15:16 +0100

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 : [email-masked]
Web: www.essensium.com   /   www.mind.be
BE 872 984 063 RPR Leuven