* How do I import upstream commits into ELPA
@ 2016-10-22 15:26 Clément Pit--Claudel
2016-10-22 20:30 ` Dmitry Gutov
0 siblings, 1 reply; 2+ messages in thread
From: Clément Pit--Claudel @ 2016-10-22 15:26 UTC (permalink / raw)
To: Emacs developers
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-22 20:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-22 15:26 How do I import upstream commits into ELPA Clément Pit--Claudel
2016-10-22 20:30 ` Dmitry Gutov
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).