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
Junio C Hamano <gitster@pobox.com>
Date
Oct 20, 2023, 23:19 UTC
Message-ID
<xmqq1qdoq3tt.fsf@gitster.g>
In-Reply-To
<841c3b59-9e7c-4492-9d66-8af42c3222ea@xiplink.com>
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?
Previous: Marc BranchaudNext: Marc Branchaud
Message 3 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.