From: Junio C Hamano Date: Wed, 30 Apr 2008 07:10:53 GMT Subject: Re: [PATCH v2 04/13] Teach rebase interactive the mark command Message-ID: <7vlk2v3jia.fsf@gitster.siamese.dyndns.org> In-Reply-To: <481810C9.3030409@viscovery.net> Johannes Sixt writes: >> The problem I had was to figure out the way to go back to "rewritten X". >> I assumed you would say "B" because that is the last insn in the sequence >> that used that name. >> >> But instead you are thinking of letting me just say "X", and somehow make >> the machinery guess by noticing "Ah, original X is a merge between >> original A and B, and we have a merge between rewritten A and rewritten B, >> so we will treat that merge as rewritten "X"? > > You had used this notion in your post: > > merge B -- recreate X > > Did you mean the '-- recreate X' part as just a comment? Purely as a comment to let the readers know what I was describing.