Marking commits not to be merged

Marking commits not to be merged

[Glenn Morris]

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.

Re: Marking commits not to be merged

[Xue Fuqiao]

On Fri, Feb 12, 2016 at 12:37 AM, Glenn Morris <rgm@gnu.org> wrote:

Hi Glenn,

> 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?

Re: Marking commits not to be merged

[Eli Zaretskii]

> 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.

Re: Marking commits not to be merged

[John Wiegley]

>>>>> Eli Zaretskii <eliz@gnu.org> writes:

>> 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.

You also maintain it for the future generations. :)

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2