Re: [PATCH v1 3/3] doc: rebase: clarify fixup! fixup! constraint

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 15, 2016, 15:42 UTC
Message-ID: <xmqqshu6hwde.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <73D1326EA2D94A1D8898884BF047C1B5@PhilipOakley>

"Philip Oakley" <philipoakley@iee.org> writes:

>> I think this is about
>
> Yes, but the original wording didn't make me think that.

Yeah, it is very plausible that it is not limited to you, and I agree that it is worthwhile to update the description around here.

Show 7 quoted lines

>>> Also, does 'earliest commit requiring fixup/squash' fully convey that
>>> its the one to fix.
>>
>> I cannot tell if that a question or a statement?
>
> It's a question. In your prior para you offer "they fix the very first
> commit that invited these fixups" as an alternate.

I think both are equally understandable to me (but I am not the primary target audience).

Show 8 quoted lines

> It's when a users mental model is that they got their first fixup
> wrong and it's that fixup they are correcting, and later they add
> different fixups to the orignal that it all gets hairy.
> (diffs must have the right sequence, while snapshots don't care - so
> if we keep the diff sequence, we don't care about the user's mental
> model as the end results are the same).
>
> The writeup needs to cope with the mental model rather than the end result.

Yes, yes.