threads / discuss / 44498

Can I squash the merge created by "git subtree add"?

Subject: Can I squash the merge created by "git subtree add"?

## tl;dr

One message between Nov 16, 2016 and Nov 16, 2016.

replies: 0people: 1as markdown or json

Kannan Goundan· Nov 16, 2016, 19:37 UTC · lore

When I do a "git subtree add", I get two commits.

    df7e8f5 Merge commit '6de34775ea846c90e3f28e9e7fdfe690385c068b' as
'go/src/gopkg.in/ns1/ns1-go.v1'
    6de3477 Squashed 'go/src/gopkg.in/ns1/ns1-go.v1/' content from
commit 1d343da

Unfortunately, in the environment I'm currently working in, merge commits aren't allowed.

Is it safe to squash these two commits into a single commit? Will future "subtree" commands still work correctly?

$ 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.