From: Jeff King <peff@peff.net>
Date: Mon, 25 Feb 2008 19:21:06 GMT
Subject: Re: [RFC/PATCH] mergetool: clarify local/remote terminology
Message-ID: <20080225192106.GB19666@sigill.intra.peff.net>
In-Reply-To: <76718490802251107y44ff2d6ahf5446ae0408c67b0@mail.gmail.com>

On Mon, Feb 25, 2008 at 02:07:11PM -0500, Jay Soffian wrote:

> I was playing with that, figuring out branch names in the same way that the
> code in bashcompletions computes ps1. However, what would you want to see if
> you're doing an interactive rebase of say HEAD vs HEAD~5. They are both the
> same branch, so what would you want to see?

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.

-Peff