Re: [RESEND] git-rebase.txt: rewrite docu for fixup/squash (again)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 2023-10-20 19:19, Junio C Hamano wrote:
Marc Branchaud <marcnarc@xxxxxxxxxxx> 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.




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux