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 21, 2023, 00:22 UTC
Message-ID
<xmqqsf64omdi.fsf@gitster.g>
In-Reply-To
<b5bc179d-46b6-4c48-bfe5-769dac38489b@xiplink.com>
Marc Branchaud <marcnarc@xiplink.com> writes:
> 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.

Yeah, "fixup" could have been a plain "squash" with some option. It could have been two options, "-i" ("ignore message of this one") and "-o" ("use message of this one alone"), and then today's "fixup" would have been "squash -i", and today's "fixup -c" would have been "squash -o".

But I agree that "squash -c" is something one may find tempting to type, after learning "fixup -c".

I forgot to comment on the real contents of your review, by the way. Everything you said was reasonable.

Previous: Marc BranchaudNext: Oswald Buddenhagen
Message 5 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.