From: Junio C Hamano Date: Fri, 08 Jun 2007 06:40:53 GMT Subject: Re: [PATCH/RFC] filter-branch: support skipping of commits more easily Message-ID: <7vzm3bkky2.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Johannes Schindelin writes: >> > IOW, given A-B-C, if commit-filter says "skip" upon B, the rewritten >> > branch will look like this: A'-C'. >> > >> > Signed-off-by: Johannes Schindelin >> > --- >> > >> > Of course, if you think of "patchsets", this behaviour might >> > be unexpected, since the children will still contain everything >> > which was changed in the skipped revisions, and not changed in >> > _them_. >> >> I think that is fine; in effect, by saying "skip" B, you are >> squashing B-C into C'. >> ... >> I am not objecting; just trying to get a mental picture. > > Yeah, but you called it "squash" instead of "skip". So, maybe it should > accept "squash" to do that operation instead? Skip is logically correct, but this does sound like squashing to me.