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

Re: [PATCH] Stgit - gitmergeonefile.py: handle removal vs. changes

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Nov 21, 2005, 21:32 UTC
Message-ID
<b0943d9e0511211332h41e3850dt@mail.gmail.com>
In-Reply-To
<437D0949.3060505@citi.umich.edu>
On 17/11/05, Chuck Lever <cel@citi.umich.edu> wrote:
> i use "original" "patch" and "older" (set up in .stgitrc) because i
> found the default labels to be confusing.
>
> but "original" "patch" and "upstream" make sense to me.

These names would need to have a meaning for the result of the 'fold --threeway' and 'pick' commands. 'patch' and 'original' are ok but 'upstream' might not make sense since for these commands it can represent the top of an existing patch.

-- Catalin

Previous: Chuck LeverNext: Blaisorblade
Message 6 of 9 in “Stgit - gitmergeonefile.py: handle removal vs. changes”
  1. Stgit - gitmergeonefile.py: handle removal vs. changesPaolo 'Blaisorblade' Giarrusso, Nov 13, 2005
  2. Catalin MarinasNov 15, 2005
  3. BlaisorbladeNov 16, 2005
  4. Catalin MarinasNov 17, 2005
  5. Chuck LeverNov 17, 2005
  6. Catalin MarinasNov 21, 2005
  7. BlaisorbladeDec 30, 2005
  8. Catalin MarinasJan 7, 2006
  9. Chuck LeverJan 8, 2006

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.