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

Re: git merge --squash isn't "marked as a merge"??

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 29, 2008, 08:53 UTC
Message-ID
<7vbq0hhxzw.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<488ECB89.5060801@sneakemail.com>
"Peter Valdemar Mørch (Lists)"  <4ux6as402@sneakemail.com> writes:
> Newbie alert:
>
> I have a feature branch where I have N tiny commits with sloppy/private
> commit messages....

Probably you would want to step back and _think_ why you want to squash in the first place. I suspect the answer would lead to a better use of the available set of tools, such as "use 'rebase -i' to clean up the original history and then 'merge' (without squash) it or 'rebase' it".

Previous: Peter Valdemar Mørch (Lists)
Message 2 of 2 in “git merge --squash isn't "marked as a merge"??”
  1. Peter Valdemar Mørch (Lists)Jul 29, 2008
  2. Junio C HamanoJul 29, 2008

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.