From: Noam Postavsky <npostavs@users.sourceforge.net>
To: Eli Zaretskii <eliz@gnu.org>
Cc: David Engster <deng@randomsample.de>,
Emacs developers <emacs-devel@gnu.org>
Subject: Re: Some proposed backports from master to emacs-25
Date: Tue, 4 Oct 2016 08:02:11 -0400 [thread overview]
Message-ID: <CAM-tV-_u2f70EX9iYH7Fxcvvc0_pw4i+-qDgv1GD0ic4n9hScQ@mail.gmail.com> (raw)
In-Reply-To: <8360p8o8fx.fsf@gnu.org>
On Tue, Oct 4, 2016 at 3:54 AM, Eli Zaretskii <eliz@gnu.org> wrote:
>> From: David Engster <deng@randomsample.de>
>> Cc: Noam Postavsky <npostavs@users.sourceforge.net>, emacs-devel@gnu.org
>> Date: Tue, 04 Oct 2016 08:51:51 +0200
>>
>> > (defvar gitmerge-skip-regexp
>> > ;; We used to include "sync" in there, but in my experience it only
>> > ;; caused false positives. --Stef
>> > "back[- ]?port\\|cherry picked from commit\\|\\(do not\\|no need to\\) merge\\|\
>> > ^^^^^^^^^^^^^^^^^^^^^^^^^
>> > re-?generate\\|bump version\\|from trunk\\|Auto-commit"
>> > "Regexp matching logs of revisions that might be skipped.
>> > `gitmerge-missing' will ask you if it should skip any matches.")
>>
>> This is only on the master branch, though. I've no idea why I didn't
>> commit this to emacs-25...
>
> The merges are only done on master, right?
Yeah, so it should be fine, except that it's potentially a bit
confusing (I asked the question because I only looked at the emacs-25
branch).
next prev parent reply other threads:[~2016-10-04 12:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-02 14:05 Some proposed backports from master to emacs-25 npostavs
2016-10-02 14:54 ` Eli Zaretskii
2016-10-02 16:40 ` Noam Postavsky
2016-10-03 7:06 ` Eli Zaretskii
2016-10-03 22:59 ` Noam Postavsky
2016-10-04 6:07 ` David Engster
2016-10-04 6:34 ` Eli Zaretskii
2016-10-04 6:51 ` David Engster
2016-10-04 7:54 ` Eli Zaretskii
2016-10-04 12:02 ` Noam Postavsky [this message]
2016-10-04 12:18 ` Eli Zaretskii
2016-10-07 1:42 ` Noam Postavsky
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=CAM-tV-_u2f70EX9iYH7Fxcvvc0_pw4i+-qDgv1GD0ic4n9hScQ@mail.gmail.com \
--to=npostavs@users.sourceforge.net \
--cc=deng@randomsample.de \
--cc=eliz@gnu.org \
--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.