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

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

From
KGKannan Goundan <kannan@cakoose.com>
Date
Nov 16, 2016, 19:37 UTC
Message-ID
<CAM7aVoVP2+v5G2f7NUt14j9NKJvJxxSFXZLANP5UqiYEQgbBqQ@mail.gmail.com>
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?

Message 1 of 1 in “Can I squash the merge created by "git subtree add"?”
  1. Kannan GoundanNov 16, 2016

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.