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

Is there a way to add a default `--squash` flag for all merges into a head?

From
Dun Peal <dunpealer@gmail.com>
Date
Mar 7, 2011, 19:28 UTC
Message-ID
<9f02bed0-fa18-46b1-a3d3-346e1cc7dc01@k15g2000prk.googlegroups.com>
Hi,

Our main Git repository supports a lot of developers working on multiple branches from master. Whenever the work on a branch is finished, the branch-owning developer(s) merge it back to master. That merge is always done with a `--squash` flag to avoid the 50+ levels deep graph we would end up with if everyone just used a true merge.

There's a configuration feaute `branch.<name>.rebase` for specifying that all merges into a branch (master in this case) would be done by rebase, so I was expecting a similar feature for always squashing back (since some developers may forget to add the flag). Unfortunately, I couldn't find it. Does it exist?

Thanks, D.
Next: Andreas Schwab
Message 1 of 9 in “Is there a way to add a default `--squash` flag for all merges into a head?”
  1. Dun PealMar 7, 2011
  2. Andreas SchwabMar 7, 2011
  3. Dun PealMar 7, 2011
  4. Junio C HamanoMar 8, 2011
  5. Dun PealMar 9, 2011
  6. Junio C HamanoMar 9, 2011
  7. Dun PealMar 9, 2011
  8. Jay SoffianMar 8, 2011
  9. Dun PealMar 10, 2011

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.