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

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

From
Jay Soffian <jaysoffian@gmail.com>
Date
Feb 25, 2008, 20:09 UTC
Message-ID
<76718490802251209u240bc0b2s8e268c7f1943c3d9@mail.gmail.com>
In-Reply-To
<20080225192106.GB19666@sigill.intra.peff.net>
On Mon, Feb 25, 2008 at 2:21 PM, Jeff King <peff@peff.net> 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?).

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.

j.
Previous: Jeff KingNext: Jeff King
Message 6 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.