From: David Engster <deng@randomsample.de>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org, Noam Postavsky <npostavs@users.sourceforge.net>
Subject: Re: Some proposed backports from master to emacs-25
Date: Tue, 04 Oct 2016 08:51:51 +0200 [thread overview]
Message-ID: <87h98s38u0.fsf@engster.org> (raw)
In-Reply-To: <83int8oc6b.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 04 Oct 2016 09:34:04 +0300")
Eli Zaretskii writes:
>> From: Noam Postavsky <npostavs@users.sourceforge.net>
>> Date: Mon, 3 Oct 2016 18:59:50 -0400
>>
>
>> On Sun, Oct 2, 2016 at 10:05 AM, <npostavs@users.sourceforge.net> wrote:
>> >
>> > Git added "cherry picked from commit" but it looks like
>> > gitmerge-skip-regexp wouldn't match that, should I change it to match?
>> >
>>
>> What about this question?
>
> Sorry, forgot to answer. I see no problems, as gitmerge-skip-regexp
> already handles that:
>
> (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...
-David
next prev parent reply other threads:[~2016-10-04 6:51 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 [this message]
2016-10-04 7:54 ` Eli Zaretskii
2016-10-04 12:02 ` Noam Postavsky
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
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=87h98s38u0.fsf@engster.org \
--to=deng@randomsample.de \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=npostavs@users.sourceforge.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).