git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* rebase --merge question
@ 2013-03-09 15:15 Stijn Souffriau
  0 siblings, 0 replies; only message in thread
From: Stijn Souffriau @ 2013-03-09 15:15 UTC (permalink / raw)
  To: git

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-03-09 15:15 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-09 15:15 rebase --merge question Stijn Souffriau

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).