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

Re: [PATCH] git-merge --squash

From
Junio C Hamano <junkio@cox.net>
Date
Jun 23, 2006, 23:11 UTC
Message-ID
<7vwtb78o2p.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.63.0606231433370.29667@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Isn't this the same as 'git-cherry-pick -n'? I often do a poor man's StGIT 
> by cherry picking my way through a messy branch, often combining patches 
> by '-n'.

Operationally, it probably is equivalent to the repeated use of 'cherry-pick -n' for all commits on a topic, but that would risk you having to resolve conflicts unnecessarily when you are shooting for as the result is a single commit, because you would have to do N merges with that workflow. Squashing is about merging the tip of the topic into mainline, so the conflict resolution needs to be done only once.

Previous: Thomas Glanzmann
Message 6 of 6 in “git-merge --squash”
  1. git-merge --squashJunio C Hamano, Jun 23, 2006
  2. Junio C HamanoJun 23, 2006
  3. Thomas GlanzmannJun 23, 2006
  4. Johannes SchindelinJun 23, 2006
  5. Thomas GlanzmannJun 23, 2006
  6. Junio C HamanoJun 23, 2006

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.