{"thread":{"id":"33117","subject":"rebase --merge question","startedAt":"2013-03-09T15:15:16Z","lastAt":"2013-03-09T15:15:16Z","messageCount":1,"participants":["Stijn Souffriau"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"210898","messageId":"513B5204.7080000@essensium.com","threadId":"33117","inReplyTo":null,"subject":"rebase --merge question","fromName":"Stijn Souffriau","fromEmail":"stijn.souffriau@essensium.com","sentAt":"2013-03-09T15:15:16Z","receivedAt":"2013-03-09T15:15:16Z","isPatch":false,"sender":{"key":"stijn.souffriau@essensium.com","avatar":null},"body":"Hi all,\n\n From help rebase:\n\n--merge\n\tUse merging strategies to rebase. When the recursive (default) merge \nstrategy is used, this allows rebase to be aware of renames on the \nupstream side.\n\nRenames of what? Files I assume. Are there any disadvantages compared to \nthe normal rebase? If not, why isn't --merge the default behaviour.\n\nThanks,\n\nStijn\n\n-- \nStijn Souffriau\nEmbedded Software Developer - Mind Embedded Software Division\n\nESSENSIUM nv\nMind - Embedded Software Division\nGaston Geenslaan 9 - B-3001 Leuven\nemail : stijn.souffriau@essensium.com\nWeb: www.essensium.com   /   www.mind.be\nBE 872 984 063 RPR Leuven\n"}]}