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

git rebase--interactive, doesn't ignore commits already in upstream

From
Mark Levedahl <mlevedahl@gmail.com>
Date
Aug 1, 2007, 11:28 UTC
Message-ID
<46B06E56.2040206@gmail.com>

git rebase -i does not correctly ignore commits in the local branch that are also in upstream. For example, create a branch that is two commits back from upstream, add one of those on to the local branch

upstream=83b3df7d58 git checkout -f $upstream git checkout -b foo $upstream~2 git cherry-pick $upstream~1 git rebase -i $upstream

"git rebase -i" happily presents commit "$upstream~1" in the list to be applied to upstream. This of course results in a conflict. Should the user simply delete the offending commit from the presented list, git rebase -i then refuses to do anything, saying "Nothing to do."

Bare "git rebase" handles this case correctly (essentially fast forwards the branch to upstream.

Mark
Next: Johannes Schindelin
Message 1 of 2 in “git rebase--interactive, doesn't ignore commits already in upstream”
  1. Mark LevedahlAug 1, 2007
  2. rebase -i: ignore patches that are in upstream alreadyJohannes Schindelin, Aug 1, 2007

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.