From: Mark Levedahl <mlevedahl@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: git rebase--interactive, doesn't ignore commits already in upstream
Date: Wed, 01 Aug 2007 07:28:22 -0400 [thread overview]
Message-ID: <46B06E56.2040206@gmail.com> (raw)
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 reply other threads:[~2007-08-01 11:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-01 11:28 Mark Levedahl [this message]
2007-08-01 14:59 ` [PATCH] rebase -i: ignore patches that are in upstream already Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46B06E56.2040206@gmail.com \
--to=mlevedahl@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).