From: Francis Moreau <francis.moro@gmail.com>
To: git@vger.kernel.org
Subject: Why sometime git-rebase doesn't preserve merge
Date: Tue, 10 May 2011 14:51:49 +0200 [thread overview]
Message-ID: <BANLkTinV1hJ4CaV_X1ospOFzH0k17aYWYA@mail.gmail.com> (raw)
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
reply other threads:[~2011-05-10 12:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BANLkTinV1hJ4CaV_X1ospOFzH0k17aYWYA@mail.gmail.com \
--to=francis.moro@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).