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

Re: Stacked GIT 0.3 (now more Quilt-like)

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Jul 4, 2005, 20:42 UTC
Message-ID
<1120509766.6879.5.camel@localhost.localdomain>
In-Reply-To
<m3y88m21ln.fsf@telia.com>
On Mon, 2005-07-04 at 14:32 +0200, Peter Osterlund wrote:
Show 5 quoted lines
> I agree with the other comments, it's probably not wise to rely on
> wiggle, and wiggle sometimes makes a mess. However, it often does the
> right thing, and with a configurable merge program and an undo
> function, this should not be a problem. Just undo and try again if you
> don't like the result.

I uploaded a new snapshot (stgit-20050704.tar.gz) which has support for merge tool configuration. It installs a default /etc/stgitrc file but you can define your own options in ~/.stgitrc or .git/stgitrc (the latter overrides the options in the earlier files). You can even define something like - 'diff3 ... || xxdiff ...' so that if one tool fails it will try the next one (the whole command is executed with 'sh -c').

I will try to write an 'undo' command in the next days.

-- Catalin

Previous: randy_dunlapNext: Catalin Marinas
Message 9 of 16 in “Stacked GIT 0.3 (now more Quilt-like)”
  1. Catalin MarinasJun 28, 2005
  2. Peter OsterlundJul 3, 2005
  3. Catalin MarinasJul 3, 2005
  4. Peter OsterlundJul 3, 2005
  5. Catalin MarinasJul 3, 2005
  6. Martin LanghoffJul 4, 2005
  7. Peter OsterlundJul 4, 2005
  8. randy_dunlapJul 4, 2005
  9. Catalin MarinasJul 4, 2005
  10. Catalin MarinasJul 6, 2005
  11. Peter OsterlundJul 7, 2005
  12. Catalin MarinasJul 7, 2005
  13. Peter OsterlundJul 8, 2005
  14. Junio C HamanoJul 8, 2005
  15. Peter OsterlundJul 8, 2005
  16. Catalin MarinasJul 8, 2005

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.