From: "Clément Pit--Claudel" <clement.pit@gmail.com>
To: Emacs developers <emacs-devel@gnu.org>
Subject: How do I import upstream commits into ELPA
Date: Sat, 22 Oct 2016 11:26:58 -0400 [thread overview]
Message-ID: <563f19bf-aee9-bef8-6a11-befbf1fe14ed@gmail.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1250 bytes --]
Hi all,
A few months ago Stefan pushed a small fix to my compact-docstrings package. I wanted to upstream it to the GitHub repository today, so I ran the following:
git remote add github-compact-docstrings cpitclaudel/compact-docstrings
git subtree push --prefix=packages/compact-docstrings/ https://github.com/cpitclaudel/compact-docstrings.git master
This seems to have worked nicely. However, I then added an extra commit to the Github repository, and I'd like to pull it into ELPA. Running
git subtree pull --prefix=packages/compact-docstrings/ github-compact-docstrings master
Gives me the following, which also seems fine:
From github.com:cpitclaudel/compact-docstrings
* branch master -> FETCH_HEAD
Auto-merging packages/compact-docstrings/compact-docstrings.el
Merge made by the 'recursive' strategy.
packages/compact-docstrings/compact-docstrings.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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? If not, how can I not re-merge Stefan's change?
Thanks!
Clément.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2016-10-22 15:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-22 15:26 Clément Pit--Claudel [this message]
2016-10-22 20:30 ` How do I import upstream commits into ELPA Dmitry Gutov
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=563f19bf-aee9-bef8-6a11-befbf1fe14ed@gmail.com \
--to=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).