From: Glenn Morris <rgm@gnu.org>
To: emacs-devel@gnu.org
Subject: Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25
Date: Tue, 12 Jan 2016 12:09:34 -0500 [thread overview]
Message-ID: <hbn8qn2r5.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <m2fuy2pw68.fsf@newartisans.com> (John Wiegley's message of "Tue, 12 Jan 2016 09:03:27 -0800")
Oh, I guess it is because the original commit message happened to
contain the word "merge", and thus match gitmerge-skip-regexp. IIRC,
gitmerge should ask you whether to skip a given commit, not just
unconditionally skip it. Some judgement is required when deciding to
answer yes or no to that prompt. The gitmerge regexp is biased to match
more rather than less.
next prev parent reply other threads:[~2016-01-12 17:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20160112070839.6841.77764@vcs.savannah.gnu.org>
[not found] ` <E1aIt4Y-0001pf-Ns@vcs.savannah.gnu.org>
2016-01-12 9:48 ` master 2d7f4d9 12/15: ; Merge from origin/emacs-25 Michael Albinus
2016-01-12 15:50 ` Eli Zaretskii
2016-01-12 16:23 ` John Wiegley
[not found] ` <E1aIt4W-0001p0-Om@vcs.savannah.gnu.org>
2016-01-12 16:50 ` master 70f3e4e 08/15: " Glenn Morris
2016-01-12 17:03 ` John Wiegley
2016-01-12 17:09 ` Glenn Morris [this message]
2016-01-12 17:12 ` John Wiegley
2016-01-18 18:26 ` Glenn Morris
2016-01-18 19:27 ` Paul Eggert
2016-01-18 21:42 ` John Wiegley
2016-01-12 17:11 ` John Wiegley
2016-01-12 17:32 ` Paul Eggert
2016-01-14 23:15 ` Phillip Lord
2016-01-19 7:38 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=hbn8qn2r5.fsf@fencepost.gnu.org \
--to=rgm@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.