From: Catalin Marinas Date: Mon, 04 Jul 2005 20:42:46 GMT Subject: Re: Stacked GIT 0.3 (now more Quilt-like) Message-ID: <1120509766.6879.5.camel@localhost.localdomain> In-Reply-To: On Mon, 2005-07-04 at 14:32 +0200, Peter Osterlund wrote: > 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