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

[Q] git rebase -i -p conflicts with squash

From
CPConstantine Plotnikov <constantine.plotnikov@gmail.com>
Date
Jan 14, 2009, 16:13 UTC
Message-ID
<85647ef50901140813r6e62ae53u1dbcd48cc472dbcc@mail.gmail.com>

If I run git rebase --interactive with --preserve-merges option and select "squash" for one of the commit, the rebase process fails with the message "Refusing to squash a merge: 5e775c536654640c173ba71a0af7e84bf8bc618a". However the neither commit participating in the squash is a merge commit. Even more, there are no merge commits in the repository at all.

>From my limited understanding of squash operation, it should fail only

if one of squashed commits is a merge commit, but it should be possible to squash non-merge commits without problem as it looks like quite safe and local operation (and I might want to preserve merges that happened after squashed commits). Is it the current behaviour a bug or a feature?

Constantine
Next: Johannes Schindelin
Message 1 of 3 in “[Q] git rebase -i -p conflicts with squash”
  1. Constantine PlotnikovJan 14, 2009
  2. Johannes SchindelinJan 15, 2009
  3. Constantine PlotnikovJan 15, 2009

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.