git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* git rebase--interactive, doesn't ignore commits already in upstream
@ 2007-08-01 11:28 Mark Levedahl
  2007-08-01 14:59 ` [PATCH] rebase -i: ignore patches that are in upstream already Johannes Schindelin
  0 siblings, 1 reply; 2+ messages in thread
From: Mark Levedahl @ 2007-08-01 11:28 UTC (permalink / raw)
  To: Git Mailing List

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-08-01 15:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-01 11:28 git rebase--interactive, doesn't ignore commits already in upstream Mark Levedahl
2007-08-01 14:59 ` [PATCH] rebase -i: ignore patches that are in upstream already Johannes Schindelin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).