From: Jeff King <peff@peff.net>
Date: Mon, 25 Feb 2008 20:11:02 GMT
Subject: Re: [RFC/PATCH] mergetool: clarify local/remote terminology
Message-ID: <20080225201102.GA21928@coredump.intra.peff.net>
In-Reply-To: <76718490802251209u240bc0b2s8e268c7f1943c3d9@mail.gmail.com>

On Mon, Feb 25, 2008 at 03:09:04PM -0500, Jay Soffian wrote:

> >  Probably HEAD and HEAD~5 (perhaps along with their oneline logs). I
> >  think the best we can do is "whatever the user said to get us here"
> >  which is not something you can calculate after the fact; you have to
> >  remember what the user said.
> 
> Right, so the porcelain would have to save this information somewhere
> for mergetool to access (yes/no/maybe?).

Yes (that's what would go into a .git/status type of file).

> Anyway, that's why the first iteration of my patch takes --left
> and --right arguments so at least you can tell it how you got
> there.

Yes, I saw that. The problem is that git-mergetool is invoked by the
user. Is it really improving the usability to have to manually specify
--left and --right? Saving and restoring the state seems like the only
useful option.

-Peff