From: Kannan Goundan <kannan@cakoose.com>
To: git@vger.kernel.org
Subject: Can I squash the merge created by "git subtree add"?
Date: Wed, 16 Nov 2016 11:37:08 -0800 [thread overview]
Message-ID: <CAM7aVoVP2+v5G2f7NUt14j9NKJvJxxSFXZLANP5UqiYEQgbBqQ@mail.gmail.com> (raw)
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?
reply other threads:[~2016-11-16 19:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAM7aVoVP2+v5G2f7NUt14j9NKJvJxxSFXZLANP5UqiYEQgbBqQ@mail.gmail.com \
--to=kannan@cakoose.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).