From: Dmitry Gutov <dgutov@yandex.ru>
To: "Clément Pit--Claudel" <clement.pit@gmail.com>,
"Emacs developers" <emacs-devel@gnu.org>
Subject: Re: How do I import upstream commits into ELPA
Date: Sat, 22 Oct 2016 23:30:39 +0300 [thread overview]
Message-ID: <4aa78390-1082-a104-249a-51db4ac6f7ef@yandex.ru> (raw)
In-Reply-To: <563f19bf-aee9-bef8-6a11-befbf1fe14ed@gmail.com>
On 22.10.2016 18:26, Clément Pit--Claudel wrote:
> However, when I look at the history that it created, I get three commits instead of 2: Stefan's change, re-pulled from the GitHub repository; my new change; and a merge commit.
>
> Is that expected?
Yes. That's how the subtree feature works, for better or worse.
prev parent reply other threads:[~2016-10-22 20:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-22 15:26 How do I import upstream commits into ELPA Clément Pit--Claudel
2016-10-22 20:30 ` Dmitry Gutov [this message]
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: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4aa78390-1082-a104-249a-51db4ac6f7ef@yandex.ru \
--to=dgutov@yandex.ru \
--cc=clement.pit@gmail.com \
--cc=emacs-devel@gnu.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://git.savannah.gnu.org/cgit/emacs.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).