From: Lars Ingebrigtsen <larsi@gnus.org>
To: Nicolas Petton <nico@petton.fr>
Cc: Eli Zaretskii <eliz@gnu.org>, Emacs Devel <emacs-devel@gnu.org>
Subject: Re: I just pushed master into emacs-27
Date: Thu, 30 Jul 2020 02:28:03 +0200 [thread overview]
Message-ID: <877dul26ek.fsf@gnus.org> (raw)
In-Reply-To: <87wo2m80nh.fsf@petton.fr> (Nicolas Petton's message of "Wed, 29 Jul 2020 23:35:46 +0200")
Nicolas Petton <nico@petton.fr> writes:
> I just realized that I pushed master into the emacs-27 branch... I must
> have rebased against master out of habit, like I always do on some other
> git repositories.
>
> I'm really sorry about this, it has made a big mess in the emacs-27
> branch.
Oops. My sympathies.
But perhaps this isn't really that serious... I mean, if it had been
master, then that would have been a different story, but this is just on
a branch, so the history there isn't really that big a deal, so you can
just revert the whole thing?
If the history is important, would it make sense, for instance, just to
make a emacs-27-2 branch starting from just before the merge and then
continue off of that?
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
next prev parent reply other threads:[~2020-07-30 0:28 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-29 21:35 I just pushed master into emacs-27 Nicolas Petton
2020-07-29 22:44 ` Amin Bandali
2020-07-29 23:05 ` Nicolas Petton
2020-07-29 23:07 ` Nicolas Petton
2020-07-30 2:36 ` Eli Zaretskii
2020-07-30 2:47 ` Stefan Monnier
2020-07-29 23:24 ` dick.r.chiang
2020-07-29 23:42 ` Amin Bandali
2020-07-30 0:28 ` Lars Ingebrigtsen [this message]
2020-07-30 1:13 ` 황병희
2020-07-30 11:30 ` Stefan Kangas
2020-07-30 2:31 ` Bob Proulx
2020-07-30 2:44 ` Stefan Monnier
2020-07-30 7:52 ` Nicolas Petton
2020-07-30 9:25 ` Andy Moreton
2020-07-30 13:12 ` Eli Zaretskii
2020-07-30 7:53 ` Nicolas Petton
2020-07-30 2:34 ` Eli Zaretskii
2020-07-30 7:52 ` Nicolas Petton
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=877dul26ek.fsf@gnus.org \
--to=larsi@gnus.org \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=nico@petton.fr \
/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).