From: Eli Zaretskii <eliz@gnu.org>
To: Xue Fuqiao <xfq.free@gmail.com>
Cc: rgm@gnu.org, emacs-devel@gnu.org
Subject: Re: Marking commits not to be merged
Date: Fri, 12 Feb 2016 09:07:24 +0200 [thread overview]
Message-ID: <83egci8l03.fsf@gnu.org> (raw)
In-Reply-To: <CAAF+z6FZXhP9e9q8aM3EKe18cOBj6EFRJTW48YSj6ECOvp7EBg@mail.gmail.com> (message from Xue Fuqiao on Fri, 12 Feb 2016 08:58:36 +0800)
> Date: Fri, 12 Feb 2016 08:58:36 +0800
> From: Xue Fuqiao <xfq.free@gmail.com>
> Cc: Emacs-devel <emacs-devel@gnu.org>
>
> > If you want to mark a commit on emacs-25 as not to be merged to master,
> > you can simply write eg "Do not merge to master" in the commit message.
> > Anything that matches gitmerge-skip-regexp will do.
> > You don't have to always write "Backport".
> > "Backport" seems to be being used to as a label for some commits that
> > aren't actually backports from master, which I find confusing.
> >
>
> Thanks for the hint!
>
> Would you please add it to CONTRIBUTE and/or admin/notes/git-workflow?
Done. I just hope people read that file frequently enough fo this to
be efficient. Sometimes I think we maintain that file for those who
already know all that stuff.
next prev parent reply other threads:[~2016-02-12 7:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-11 16:37 Marking commits not to be merged Glenn Morris
2016-02-12 0:58 ` Xue Fuqiao
2016-02-12 7:07 ` Eli Zaretskii [this message]
2016-02-18 3:59 ` 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=83egci8l03.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=rgm@gnu.org \
--cc=xfq.free@gmail.com \
/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.