git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Why sometime git-rebase doesn't preserve merge

From
FMFrancis Moreau <francis.moro@gmail.com>
Date
May 10, 2011, 12:51 UTC
Message-ID
<BANLkTinV1hJ4CaV_X1ospOFzH0k17aYWYA@mail.gmail.com>
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
Message 1 of 1 in “Why sometime git-rebase doesn't preserve merge”
  1. Francis MoreauMay 10, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.