Re: [PATCH 0/3] git help: group common commands by theme

From: Junio C Hamano <gitster@pobox.com>
Date: May 8, 2015, 18:53 UTC
Message-ID: <xmqqlhgylx3l.fsf@gitster.dls.corp.google.com>
In-Reply-To: <554CF9A4.4050103@gmail.com>

Sébastien Guimmara  <sebastien.guimmara@gmail.com> writes:

Show 6 quoted lines

> A preliminary question to prepare the next round (v5) of this patch:
>
> All versions of these patches were based upon the tip of 'master' 2.4.0
> (3d4a3ff).
>
> Should I rebase subsequent patches on top of 'next' ?

I think doing it on 2.4.0 is fine.

In general, you shouldn't base anything on 'next', unless you are using some new features that are still cooking in 'next' on their own topic branches. And even if that were the case, I would prefer a series that introduces a new feature to wait for those other topic branches it wants to use to graduate to 'master'. Alternatively, you can identify these still-in-flight topics that you absolutely need to depend on, merge them to 'master' yourself, _and_ build your patches on top, but please make it clear that you did that when sending the patches in if you take this route. Your patches would become hostage of these other topics and cannot graduate to 'master' before they do, so keep that in mind if you do so.

Whatever you do, you would still need to make sure that the result of applying your patches merges cleanly to 'next' and works well.

Needless to say, a fix is preferrable to be based on 'maint' (or even older maintenance tracks when it is feasible), but that does not concern this "update help output" topic.

Thanks.