Junio C Hamano da6e86d371 MaintNotes: clarify the purpose of maint->master upmerge ...

Even though the paragraph before this one is pretty clear that
topics are first merged to 'master' and then to 'maint', it was
misleading to say 'maint' is merged to 'master' to propagate fixes
forward, as most of the time, such an upmerge is a noop because
topics merged to 'maint' are usually merged to 'master' already.

These up-merges are done primarily to make sure that the tip of
'master' has updated release notes from all the maintenance tracks,
so be explicit about that to avoid confusion.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

2018-01-08 12:55:22 -08:00

11 KiB

Raw Blame History

View Raw