From: Junio C Hamano <junkio@cox.net>
To: Eric Wong <normalperson@yhbt.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH (fixed)] rebase: Allow merge strategies to be used when rebasing
Date: Wed, 21 Jun 2006 04:01:35 -0700 [thread overview]
Message-ID: <7v4pye22nk.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: 11508842824018-git-send-email-normalperson@yhbt.net
Eric Wong <normalperson@yhbt.net> writes:
> 1 - is fixed for --onto usage.
More importantly, it used to rebase "side edits further" commit
incorrectly in the test sequence -- the commit should only touch
"newfile", but it touched "renamed" as well. Your updated patch
fixes this problem.
next prev parent reply other threads:[~2006-06-21 11:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-18 3:02 [PATCH] rebase: Allow merge strategies to be used when rebasing Eric Wong
2006-06-18 9:08 ` Junio C Hamano
2006-06-19 21:39 ` Eric Wong
2006-06-19 21:55 ` Junio C Hamano
2006-06-21 10:01 ` Eric Wong
2006-06-21 10:04 ` [PATCH (fixed)] " Eric Wong
2006-06-21 10:04 ` [PATCH 1/3] " Eric Wong
2006-06-21 10:04 ` [PATCH 3/3] rebase: error out for NO_PYTHON if they use recursive merge Eric Wong
2006-06-21 11:01 ` Junio C Hamano [this message]
2006-06-21 11:01 ` [PATCH] rebase: Allow merge strategies to be used when rebasing Junio C Hamano
2006-06-18 11:48 ` [PATCH] Add renaming-rebase test Junio C Hamano
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=7v4pye22nk.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
/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