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@xxxxxxxxxxxxx
Web: www.essensium.com / www.mind.be
BE 872 984 063 RPR Leuven
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html