From: Paul Eggert <eggert@cs.ucla.edu>
To: Lars Ingebrigtsen <larsi@gnus.org>, emacs-devel@gnu.org
Subject: Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Tue, 27 Jan 2015 22:37:44 -0800 [thread overview]
Message-ID: <54C883B8.6050506@cs.ucla.edu> (raw)
In-Reply-To: <87mw53zijz.fsf@building.gnus.org>
Lars Ingebrigtsen wrote:
> I hope that didn't ... destroy anything.
This is git, so nothing is ever destroyed, it's just ... mutated.
I repaired the problems I found in master commit
39c2fa3f4e5bf332cc30266d36d5410c4ffeaac4. Your commit merged from emacs-24,
which is generally a good thing to do, so I left that part alone.
I didn't fix the dates in the ChangeLogs; you can take a look at those. The
convention is that the dates are supposed to be as of the merge, not as of the
original checkin. Which reminds me, we need to get the ball rolling again on
having ChangeLogs generated automatically, to avoid that part of the merge
hassle in the future.
next prev parent reply other threads:[~2015-01-28 6:37 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20150128032211.21589.96959@vcs.savannah.gnu.org>
[not found] ` <E1YGJCm-0005dC-5P@vcs.savannah.gnu.org>
2015-01-28 3:32 ` master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Lars Ingebrigtsen
2015-01-28 4:02 ` Lars Ingebrigtsen
2015-01-28 6:37 ` Paul Eggert [this message]
2015-01-28 6:45 ` Lars Ingebrigtsen
2015-01-28 7:16 ` Paul Eggert
2015-01-28 7:20 ` Lars Ingebrigtsen
2015-01-28 7:31 ` Lars Ingebrigtsen
2015-01-28 15:34 ` Eli Zaretskii
2015-01-28 15:45 ` Andreas Schwab
2015-01-28 16:32 ` Yuri Khan
2015-01-28 17:24 ` Eli Zaretskii
2015-01-28 17:39 ` Yuri Khan
2015-01-28 17:46 ` Eli Zaretskii
2015-01-28 17:53 ` Yuri Khan
2015-01-28 18:30 ` git push precautions Ivan Shmakov
2015-01-28 18:42 ` Eli Zaretskii
2015-01-28 18:52 ` David Kastrup
2015-01-28 18:57 ` Kelvin White
2015-01-28 19:12 ` Ivan Shmakov
2015-01-28 19:15 ` Eli Zaretskii
2015-01-28 19:34 ` David Kastrup
2015-01-29 5:39 ` Yuri Khan
2015-01-29 16:03 ` Eli Zaretskii
2015-01-29 17:47 ` Paul Eggert
2015-01-29 17:50 ` Eli Zaretskii
2015-01-29 17:57 ` Ivan Shmakov
2015-01-28 17:21 ` master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Eli Zaretskii
2015-01-28 17:46 ` Andreas Schwab
2015-01-28 18:39 ` Eli Zaretskii
2015-01-28 19:07 ` git push precautions Ivan Shmakov
2015-01-29 9:07 ` master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Andreas Schwab
2015-01-29 10:40 ` Nicolas Richard
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=54C883B8.6050506@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=larsi@gnus.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.