"Martin Langhoff" <martin.langhoff@gmail.com> writes: > 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. You can use both. The VC backend is a per-file mode, that's handy when you are editing a file and want a quick diff/revert/commit of just that file; the commands are executed directly from the buffer containing the file. When making bigger changes, you should use the git-status mode (the one in git.el), which is a tree browser that gives you a view of the whole project. > 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. What emacs mode do you use to resolve conflicts? From the git-status buffer, if you edit a file with 'f' it will automatically turn on smerge mode if there are conflicts, or you can edit it in ediff merge mode with 'd E' like under pcl-cvs. Is that what you mean? -- Alexandre Julliard julliard@winehq.org - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Sun Mar 05 21:00:49 2006
This archive was generated by hypermail 2.1.8 : 2006-03-05 21:01:05 EST