From: John Wiegley <jwiegley@gmail.com>
To: Alan Mackenzie <acm@muc.de>
Cc: Juri Linkov <juri@linkov.net>, emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] scratch/follow e8937ed: Replace GROUP argument in six window primitives by new functions.
Date: Tue, 15 Dec 2015 07:22:32 -0800 [thread overview]
Message-ID: <m2r3in4tzb.fsf_-_@newartisans.com> (raw)
In-Reply-To: <20151215131539.GA5018@acm.fritz.box> (Alan Mackenzie's message of "Tue, 15 Dec 2015 13:15:39 +0000")
>>>>> Alan Mackenzie <acm@muc.de> writes:
> Any objections to me merging (or rebasing) this into the emacs-25 branch? I
> think it's ready.
If you receive no objections by week's end, please feel free to merge it in.
> By the way, is it normal to merge or to rebase in such circumstances. The
> code is currently in branch scratch/follow.
Personally I prefer merges for any branches that has been seen by others, as
it preserves the true history of the work. But if the policy has been to
rebase feature branches before merging them in, that works too.
--
John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2
next prev parent reply other threads:[~2015-12-15 15:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20151214165252.26784.43201@vcs.savannah.gnu.org>
[not found] ` <E1a8WMm-0006yi-Di@vcs.savannah.gnu.org>
2015-12-15 1:30 ` [Emacs-diffs] scratch/follow e8937de: Replace GROUP argument in six window primitives by new functions John Wiegley
2015-12-15 13:15 ` Alan Mackenzie
2015-12-15 15:22 ` John Wiegley [this message]
2015-12-16 0:39 ` Juri Linkov
2015-12-17 22:14 ` Alan Mackenzie
2015-12-17 23:52 ` Juri Linkov
2015-12-18 0:43 ` [Emacs-diffs] scratch/follow e8937ed: " John Wiegley
2015-12-18 10:57 ` Alan Mackenzie
2015-12-20 13:05 ` Alan Mackenzie
2015-12-22 19:19 ` John Wiegley
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=m2r3in4tzb.fsf_-_@newartisans.com \
--to=jwiegley@gmail.com \
--cc=acm@muc.de \
--cc=emacs-devel@gnu.org \
--cc=juri@linkov.net \
/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).