[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Marking commits not to be merged
|
From: |
Eli Zaretskii |
|
Subject: |
Re: Marking commits not to be merged |
|
Date: |
Fri, 12 Feb 2016 09:07:24 +0200 |
> Date: Fri, 12 Feb 2016 08:58:36 +0800
> From: Xue Fuqiao <address@hidden>
> Cc: Emacs-devel <address@hidden>
>
> > 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.