From: Junio C Hamano Date: Sun, 28 Feb 2010 21:17:45 GMT Subject: Re: [PATCH] Support merge strategy options in rebase Message-ID: <7vaautvz46.fsf@alter.siamese.dyndns.org> In-Reply-To: <1267332207-22675-1-git-send-email-mike@fluffypenguin.org> Mike Lundy writes: > The manpage says that git-rebase supports merge strategies, but the rebase > command doesn't know about -X, and gives the usage when presented with it. > > Signed-off-by: Mike Lundy > --- > > My test modification only makes sure that the argument is accepted; it assumes > merge strategies are already tested and they won't actually be needed, because > there's no conflict. How well does this work when strategy options need to contain a whitespace?