Re: What's in git.git

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Mar 5, 2006, 09:21 UTC
Message-ID: <46a038f90603050121u6bccbb71ve78de69ae45b96ad@mail.gmail.com>
In-Reply-To: <7vacc5jza6.fsf@assigned-by-dhcp.cox.net>

On 3/5/06, Junio C Hamano <junkio@cox.net> wrote:

Show 7 quoted lines

>  - Emacs interface (Alexandre Julliard)
>    contrib/emacs: Add an Emacs VC backend.
>    git.el: Added customize support for all parameters.
>    git.el: Added support for Signed-off-by.
>    git.el: Automatically update .gitignore status.
>    git.el: Portability fixes for XEmacs and Emacs CVS.
>    git.el: Set default directory before running the status mode setup hooks.

I'm somewhat confused by the fact that there are two emacs modes, both by Alexandre. Which one should I use? Also -- the killer app for emacs+git would be to leverage the great patch-editing mode in emacs.

Can we get a new merge conflict mode that generates .rej files? Emacs is superb at dealing with conflicts formatted that way. OTOH, it may be able to deal smartly with diff3-style conflicts if it knows how to talk with the VC backend -- I think the cvs mode can do that.

Linus has mentioned several times that it is more important to have well oiled tools to deal with conflicts when they happen -- easy visualization of what the different versions were, commit msgs, highlight characters that don't match in a line that looks the same at first glance, etc -- than to try and magically resolve conflicts. I'm in violent agreement, and keen on seeing the emacs vc stuff fill that gap.

(of course, if xxdiff and others can help, that'd be cool too, but currently they seem strangely unable to deal with files with diff3 conflict markers.)

>  - git-cvsserver updates (Martin Langhoff)

Wohoo! This needs testers -- give it a whirl, please! BTW, the workarounds for Eclipse mentioned in the doco are no longer needed. Still, you do want to give Documentation/git-cvsserver.txt a quick read.

cheers,

martin