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

Re: git merge --no-commit <branch>; does commit

From
Alex Riesen <raa.lkml@gmail.com>
Date
Dec 15, 2007, 19:37 UTC
Message-ID
<20071215193741.GB3021@steel.home>
In-Reply-To
<alpine.LSU.0.99999.0712151905280.4341@castor.milkiway.cos>
Michael Dressel, Sat, Dec 15, 2007 19:14:48 +0100:
Show 5 quoted lines
>> Maybe. Or maybe you misunderstood the meaning of --squash, which also
>> is not a merge.
>
> Since "git merge --squash <branch>" does a merge of <branch> into the 
> working tree why would you not call it a merge?

Because merge, in Git language, means connection histories. That one just mixes the text. That's different operation, kind of editing a file.

Show 5 quoted lines
> Anyway that was what I wanted. Merging <branch> (a topic branch) into my 
> current branch (the main branch) but being able to create commits that are
> more suitable for keeping in the history of the current branch than the
> commits I created during developing on <branch>.
> Would you recommend a different way of doing this?

I would not recommend doing it at all. If I must, I'd rather use git-rebase -i (interactive rebase).

Previous: Michael DresselNext: Michael Dressel
Message 12 of 14 in “git merge --no-commit <branch>; does commit”
  1. Michael DresselDec 13, 2007
  2. Alex RiesenDec 13, 2007
  3. Alex RiesenDec 13, 2007
  4. Michael DresselDec 13, 2007
  5. Alex RiesenDec 14, 2007
  6. Michael DresselDec 15, 2007
  7. Björn SteinbrinkDec 15, 2007
  8. Jakub NarebskiDec 15, 2007
  9. Michael DresselDec 15, 2007
  10. Jakub NarebskiDec 15, 2007
  11. Michael DresselDec 15, 2007
  12. Alex RiesenDec 15, 2007
  13. Michael DresselDec 15, 2007
  14. Alex RiesenDec 16, 2007

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.