From: Thomas Rast <trast@student•ethz.ch>
To: Benny Halevy <bhalevy@panasas•com>
Cc: Git List <git@vger•kernel.org>
Subject: Re: git rebase + fuzz = possible bad merge
Date: Mon, 23 Mar 2009 14:54:43 +0100 [thread overview]
Message-ID: <200903231454.48600.trast@student.ethz.ch> (raw)
In-Reply-To: <49C7675E.9000309@panasas.com>
[-- Attachment #1: Type: text/plain, Size: 723 bytes --]
Benny Halevy wrote:
> I'm hitting bad merges with (non interactive) git rebase
> when a hunk is merged pre-maturely into an inexact match
> when there's fuzz.
[...]
> { for i in {1..10}; do echo fuzz $i; done; echo; cat test_file; } > fuzz_file
[...]
> git rebase --onto test_branch master^ master
git-am, and by extension rebase, by default doesn't take history into
account. It just applies the patches "blindly". Thus, there's no way
to know which series of 'line N' you really wanted it to go onto.
To avoid this issue, use the -m option to git-rebase so that it uses a
"real" merge. (You can achieve similar effects for git-am with the -3
option.)
--
Thomas Rast
trast@{inf,student}.ethz.ch
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2009-03-23 13:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-23 10:41 git rebase + fuzz = possible bad merge Benny Halevy
2009-03-23 13:54 ` Thomas Rast [this message]
2009-03-23 14:06 ` Benny Halevy
2009-03-23 15:36 ` Benny Halevy
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=200903231454.48600.trast@student.ethz.ch \
--to=trast@student$(echo .)ethz.ch \
--cc=bhalevy@panasas$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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