git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Marc Branchaud <marcnarc@xiplink.com>
Date
Oct 20, 2023, 23:56 UTC
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:
Show 13 quoted lines
> 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.
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 6 in “[RESEND] git-rebase.txt: rewrite docu for fixup/squash (again)”
  1. Oswald BuddenhagenOct 20, 2023
  2. Marc BranchaudOct 20, 2023
  3. Junio C HamanoOct 20, 2023
  4. Marc BranchaudOct 20, 2023
  5. Junio C HamanoOct 21, 2023
  6. Oswald BuddenhagenOct 21, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.