Emacs based on the Git Diff Tool?

Are there any visual analysis tools based on emacs avialable? If multiple tools are available, which is better or more specifically, which is easier to use?

How to configure this diff tool from git and inside emacs?

Just to clarify, I will access this often from outside emacs. I usually run git from the command line, and currently I mainly develop in Visual Studio on Windows, although I also develop on Linux (usually using emacs or Geany in this case) and Apple Mac (mainly command line and emacs) .

Is there any serious drawback to using emacs for the diff tool if I am currently developing Visual Studio on Windows?

Thanks.

+6
source share
3 answers

If you want to use git with Emacs, you have several tools:

I use magit, its status mode will list the changed files, and you can use TAB to show the difference between worktree and index, or between index and HEAD.

It can also invoke git diff to see the differences between different versions of the working line ( d or d key).

He will also be able to use ediff to merge unrelated files and more.

+5
source

ediff is a visual comparison tool built into Emacs.

Of course, this depends on external comparison tools, so Windows users need to ensure their availability: How to use ediff under Windows + NTEmacs?

There are many ediff built-in functions, so you can take a look at the autocomplete for Mx ediff TAB to get an idea of ​​some of the available functions, and then read the manual on the information pages:

M-: (info "(ediff) Top") RET

Useful pages in the Emacs Wiki:

+6
source

I moved from Darcs, where I really liked the Darcsum mode. Fortunately, his companion moved to Git and now offers Gitsum. The workflow is mainly done by gitsum-whatsnew and chooses what differences you want to make from a complete demarcation. http://chneukirchen.org/blog/archive/2008/02/introducing-gitsum.html

0
source

Source: https://habr.com/ru/post/901962/


All Articles