* Marking commits not to be merged
@ 2016-02-11 16:37 Glenn Morris
2016-02-12 0:58 ` Xue Fuqiao
0 siblings, 1 reply; 4+ messages in thread
From: Glenn Morris @ 2016-02-11 16:37 UTC (permalink / raw)
To: emacs-devel
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Marking commits not to be merged
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
0 siblings, 1 reply; 4+ messages in thread
From: Xue Fuqiao @ 2016-02-12 0:58 UTC (permalink / raw)
To: Glenn Morris; +Cc: Emacs-devel
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?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Marking commits not to be merged
2016-02-12 0:58 ` Xue Fuqiao
@ 2016-02-12 7:07 ` Eli Zaretskii
2016-02-18 3:59 ` John Wiegley
0 siblings, 1 reply; 4+ messages in thread
From: Eli Zaretskii @ 2016-02-12 7:07 UTC (permalink / raw)
To: Xue Fuqiao; +Cc: rgm, emacs-devel
> 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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Marking commits not to be merged
2016-02-12 7:07 ` Eli Zaretskii
@ 2016-02-18 3:59 ` John Wiegley
0 siblings, 0 replies; 4+ messages in thread
From: John Wiegley @ 2016-02-18 3:59 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: Xue Fuqiao, rgm, emacs-devel
>>>>> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-02-18 3:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2016-02-18 3:59 ` John Wiegley
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).