"Martin Langhoff" <martin.langhoff@xxxxxxxxx> writes: > So I should use a combination of both? Hmmm. Worth exploring, can you > give us a quick guide on getting started with it? (Or where should I > read? I'm not that good with emacs)... To get started with the VC backend, make sure vc-git.el is somewhere on your emacs load-path, and add GIT to the vc-handled-backends variable; the easiest is with customize, something like `M-x customize-variable [RET] vc-handled-backends'. Once you have done that, when you open a file that's under git control, the vc-git mode should automatically be turned on, and you should see a "GIT" indicator in the modeline. Then you can use the standard VC backend commands (the ones that start with the C-x v prefix). The Emacs VC mode is documented at: http://www.gnu.org/software/emacs/manual/html_node/Version-Control.html For the git-status mode, simply do a `M-x load-file [RET] git.el', and then `M-x git-status'. This will prompt you for the directory to view, and display a list of modified files. From there you can mark files and perform actions on group of files, like diff, commit, revert, etc. There isn't a lot of documentation at this point, but a `C-h m' will show you the list of key bindings, so you can try them all and see what happens ;-) > Oh. Ah. Ok! I'll have to try this! So far, I've had good luck > following this guide: > > http://wiki.gnuarch.org/Process_20_2a_2erej_20files > > which is targetted pretty much at dumb emacs users. Like me ;-) smerge mode is a very simple mode to edit files that contain conflict markers, in my experience it works pretty well. The nice thing is that it works directly from the file buffer, so you don't need to jump back and forth between file and diff. -- Alexandre Julliard julliard@xxxxxxxxxx - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html