all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Leo Liu <sdl.web@gmail.com>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: emacs-devel@gnu.org
Subject: Re: ELPA screwup
Date: Tue, 22 Apr 2014 09:44:22 +0800	[thread overview]
Message-ID: <m3eh0qw32h.fsf@gmail.com> (raw)
In-Reply-To: <87bnvup34f.fsf@yandex.ru> (Dmitry Gutov's message of "Tue, 22 Apr 2014 05:25:04 +0400")

On 2014-04-22 05:25 +0400, Dmitry Gutov wrote:
>> Just now merging easy-kill updates into ELPA somehow all files are
>> merged into elpa/admin overriding things there.
>
> That's weird. I wonder how you perform the merges.

I did: git pull -s subtree easy-kill master

where easy-kill is a remote.

>> How could I fix this? (It seems cannot reset HEAD to before my push).
>
> 'git revert 6e73bbb -m 1' seems to be what you're looking for.
>
> Although maybe we'd prefer someone with admin access to force push the
> result of 'git reset --hard a1fe7f0'.

Thanks I'll wait a bit before using revert.

Leo



  reply	other threads:[~2014-04-22  1:44 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-22  0:42 ELPA screwup Leo Liu
2014-04-22  1:25 ` Dmitry Gutov
2014-04-22  1:44   ` Leo Liu [this message]
2014-04-22  3:20   ` Stefan Monnier
2014-04-22  3:45     ` Leo Liu
2014-04-22  8:42       ` Leo Liu
2014-04-22 10:58         ` Thien-Thi Nguyen
2014-04-22 15:56           ` Leo Liu
2014-04-22 14:36         ` Stefan Monnier
2014-04-22 15:50           ` Leo Liu

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m3eh0qw32h.fsf@gmail.com \
    --to=sdl.web@gmail.com \
    --cc=dgutov@yandex.ru \
    --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 external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.