Re: kha/safe and kha/experimental updated

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Dec 19, 2007, 10:19 UTC
Message-ID: <b0943d9e0712190219oa6ebe5bk321f090e4fe0469a@mail.gmail.com>
In-Reply-To: <87bq8nkoma.fsf@lysator.liu.se>

On 19/12/2007, David Kågedal <davidk@lysator.liu.se> wrote:

Show 14 quoted lines

> "Catalin Marinas" <catalin.marinas@gmail.com> writes:
> > I'd also like to re-add the stgit.keeporig option and additional
> > functionality so that the *.{ancestor,current,patched} can be left in
> > the working tree. Some people might use them when manually fixing
> > conflicts (I have a look at them from time to time when the emacs +
> > ediff shows a hard to understand conflict).
>
> Since all the information is in git, it is of course easy to recreate
> it. But the important question to ask is: how do you use these extra
> files? git.el provides a way to diff against both parent versions, and
> maybe that is actually what you need.
>
> I don't mind that you want these files, but they are mostly clutter to
> me.

You can set stgit.keeporig to 'no' if you don't want these files.

For people not using emacs + git.el, the files might be useful. As you said, you could use 'git diff -2/-3' but, in various occasions I just wanted to copy a block of code from one of the checked-out stages. Without this feature, I would have to use plain git and remember what stage corresponds to my patch.

Note that there are other users (apart from me) that use StGIT almost exclusively. I really don't like forcing them to use more and more plain git commands (at some point, they might even discover 'git rebase -i' to be good enough and give up on StGIT :-)).

-- 
Catalin