* Why sometime git-rebase doesn't preserve merge
@ 2011-05-10 12:51 Francis Moreau
0 siblings, 0 replies; only message in thread
From: Francis Moreau @ 2011-05-10 12:51 UTC (permalink / raw)
To: git
Hello,
I'm using "git rebase -p" to rebase (not a suprise here) my devel
branch onto the master one.
In my devel branch, I've merged some remote branches.
Some merges are recreated, since I passed the -p switch, but some are
not and all commits from the remote branch are inlined in my devel
branch.
Could anybody tell me why this happen and how I can avoid this behaviour ?
Shouldn't git-rebase fail if -p is passed ?
Thanks
--
Francis
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-05-10 12:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-10 12:51 Why sometime git-rebase doesn't preserve merge Francis Moreau
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).