threads / discuss / 27315

Why sometime git-rebase doesn't preserve merge

Subject: Why sometime git-rebase doesn't preserve merge

## tl;dr

One message between May 10, 2011 and May 10, 2011.

replies: 0people: 1as markdown or json

Francis Moreau· May 10, 2011, 12:51 UTC · lore

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

$ 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.