git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [RFC/PATCH] mergetool: clarify local/remote terminology

From
Jeff King <peff@peff.net>
Date
Feb 25, 2008, 19:21 UTC
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
Previous: Jay SoffianNext: Jay Soffian
Message 5 of 10 in “mergetool: clarify local/remote terminology”
  1. mergetool: clarify local/remote terminologyJay Soffian, Feb 21, 2008
  2. Jay SoffianFeb 25, 2008
  3. Jeff KingFeb 25, 2008
  4. Jay SoffianFeb 25, 2008
  5. Jeff KingFeb 25, 2008
  6. Jay SoffianFeb 25, 2008
  7. Jeff KingFeb 25, 2008
  8. Jeff KingFeb 28, 2008
  9. Junio C HamanoFeb 29, 2008
  10. Jeff KingMar 1, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.