Mike Lundy <mike@xxxxxxxxxxxxxxxxx> 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 <mike@xxxxxxxxxxxxxxxxx> > --- > > 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? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html