From: Sverre Rabbelier Date: Mon, 16 Nov 2009 22:04:12 GMT Subject: Re: [PATCH 3/3] rebase: refuse to rebase with -s ours Message-ID: In-Reply-To: <7viqdannxo.fsf@alter.siamese.dyndns.org> Heya, On Mon, Nov 16, 2009 at 22:45, Junio C Hamano wrote: > I can _guess_ what you are _not_ talking about but I cannot tell what you > _are_ talking about; sorry. I would hazard a way for the merge strategy to indicate whether it is fit to be used as rebase strategy? -- Cheers, Sverre Rabbelier