threads / discuss / 25502

Rebase vs Rebase-I differences

Subject: Rebase vs Rebase-I differences

## tl;dr

One message between Oct 21, 2010 and Oct 21, 2010.

replies: 0people: 1as markdown or json

Jan Engelhardt· Oct 21, 2010, 15:19 UTC · lore

Hi,

small bug observed in git 1.7.1: when one does `git rebase otherbranch` and there is a conflict, the conflict markers won't be showing the SHA id. In contrast to that, they do appear when using `git rebase -i otherbranch`.

<<<<<<< this ======= that

>>>>>>> 75a435a... commit message

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