From: Marc Branchaud <marcnarc@xiplink.com>
Date: Fri, 20 Oct 2023 23:56:09 GMT
Subject: Re: [RESEND] git-rebase.txt: rewrite docu for fixup/squash (again)
Message-ID: <b5bc179d-46b6-4c48-bfe5-769dac38489b@xiplink.com>
In-Reply-To: <xmqq1qdoq3tt.fsf@gitster.g>


On 2023-10-20 19:19, Junio C Hamano wrote:
> Marc Branchaud <marcnarc@xiplink.com> writes:
> 
>> [1] Makes me wonder if rebase should also support "squash -c"...
> 
> How would it be different from "fixup -c", though?
> 
> A "pick" followed by either "fixup -c" or "squash -c" will have the
> same effect on the contents (i.e., apply the changes both commits
> want to make to their respective parents) and present the end user
> an editor buffer filled with the commit specified by the "-c"
> option, right?
> 
> Or am I missing something?

No, you're not.

I should have added "as a convenience".  Squash and fixup are similar 
enough that it seems reasonable for them to both support -c.  Saves 
people from having to remember that only fixup allows -c.

		M.