From: Jeff King <peff@peff.net>
Date: Fri, 26 Oct 2012 14:00:56 GMT
Subject: Re: [PATCH v2] git-submodule add: Add -r/--record option.
Message-ID: <20121026140056.GL1455@sigill.intra.peff.net>
In-Reply-To: <20121025221431.GH13647@odin.tremily.us>

On Thu, Oct 25, 2012 at 06:14:31PM -0400, W. Trevor King wrote:

> Should I rebase this so it lands cleanly atop 38ae92e4 in next?
> 
>   commit 38ae92e4d027063b9b87e51a9bf12809d10066f6
>   Author: W. Trevor King <wking@tremily.us>
>   Date:   Tue Oct 23 17:00:21 2012 -0400
> 
>     git-submodule: wrap branch option with "<>" in usage strings.

In general, it is not a good idea to base your patches on things in
next, because it means your topic is held hostage to the one in next,
which may or may not graduate to master. We can always do a merge later
(and in this case, it is really just a one-line conflict).

-Peff