git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Steven Grimm <koreth@midwinter.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [RFC] Replace rebase with filtering
Date: Tue, 16 Jan 2007 12:40:30 -0800	[thread overview]
Message-ID: <45AD383E.50105@midwinter.com> (raw)
In-Reply-To: <Pine.LNX.4.63.0701162131130.22628@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin wrote:
> That is correct, but --ignore-if-in-upstream actually tests the hash of 
> the _diff_, not of the commit. So, if c really introduces the same change 
> as f (i.e. the diffs are identical), git-rebase will ignore f:
>
> a---b---c---d
>              \
>               e'---g'
>
> Totally untested, of course. But this is what --ignore-if-in-upstream was 
> written for.
>   

Okay, great, that is certainly an improvement over what I thought was 
happening. But it won't work if you had to manually resolve a conflict 
during the rebase, yes? In that case the diffs would presumably not match.

-Steve

  reply	other threads:[~2007-01-16 20:40 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-16  2:41 [RFC] Replace rebase with filtering Steven Grimm
2007-01-16 11:18 ` Johannes Schindelin
2007-01-16 19:20   ` Steven Grimm
2007-01-16 19:43     ` Steven Grimm
2007-01-16 20:35       ` Johannes Schindelin
2007-01-16 20:40         ` Steven Grimm [this message]
2007-01-16 21:14           ` Jakub Narebski
2007-01-16 21:22             ` Shawn O. Pearce
2007-01-16 21:23             ` Johannes Schindelin
2007-01-16 21:20           ` Johannes Schindelin
2007-01-16 21:49             ` Jakub Narebski
2007-01-16 22:31               ` Brian Gernhardt
2007-01-16 22:51                 ` Johannes Schindelin
2007-01-16 22:53                   ` Junio C Hamano
2007-01-16 22:57                     ` Johannes Schindelin
2007-01-17 22:21             ` Steven Grimm

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=45AD383E.50105@midwinter.com \
    --to=koreth@midwinter.com \
    --cc=Johannes.Schindelin@gmx.de \
    --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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).