From: Junio C Hamano <junkio@cox.net>
To: Martin Langhoff <martin.langhoff@gmail.com>
Cc: Mike McCormack <mike@codeweavers.com>, git@vger.kernel.org
Subject: Re: git rebase behaviour changed?
Date: Tue, 17 Jan 2006 00:56:21 -0800 [thread overview]
Message-ID: <7vhd83b5ca.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <7vvewjb5xz.fsf@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Tue, 17 Jan 2006 00:43:20 -0800")
Junio C Hamano <junkio@cox.net> writes:
> You are right. We will lose #1 and #2, (although the "already
> up to date" might catch some cases) and this _is_ dangerous. I
> need to do something about this soon.
Actually, I think we are OK; I do not think we would lose any
commits. git-format-patch (actually, git-cherry called from
there) does the right thing. It does not use the merge base
done in git-rebase in any way.
In any case, we _do_ need an explanation and error-out upon
finding a merge, as we discussed. If somebody really wants to
rebase a merge, he can do that by hand, as Mike easily
demonstrated.
prev parent reply other threads:[~2006-01-17 8:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-17 3:49 git rebase behaviour changed? Mike McCormack
2006-01-17 5:50 ` Junio C Hamano
2006-01-17 6:08 ` Mike McCormack
2006-01-17 6:29 ` Junio C Hamano
2006-01-17 6:52 ` Martin Langhoff
2006-01-17 8:11 ` Junio C Hamano
2006-01-17 8:33 ` Martin Langhoff
2006-01-17 8:43 ` Junio C Hamano
2006-01-17 8:56 ` Junio C Hamano [this message]
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=7vhd83b5ca.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=martin.langhoff@gmail.com \
--cc=mike@codeweavers.com \
/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).