Questions tagged [diff]

The tag has no usage guidance.

Filter by
Sorted by
Tagged with
12
votes
1answer
4k views

Magit diff side by side

I would like to know if there is a way to get the standard side by side diff view in magit. That is, instead of seeing the old code chunk and the new one one after the other, I'd like to see them on ...
5
votes
3answers
2k views

How do I check if two regions have identical content?

How do i check if two regions have identical content? Is it possible to do so while ignoring language-specific whitespace?
7
votes
1answer
199 views

Lightweight (pure elisp) diffs?

I need to display word-diffs of a number of small strings. That is, I have a list of pairs similar to the following: "aaa bbb ccc" . "aaa vv ccc" "abcd ef ghkl" . "ghkl" "a (u -> h)" . "(a -> ...
3
votes
1answer
102 views

Running diff in Magit, filtered to only some specific files

I’m basically trying to run this command, but in Magit: git diff master..17 -- "**/*.scala" … i.e. to view changes in all *.scala files between ref/heads/master and ref/heads/17. I’ve tried setting ...
1
vote
1answer
232 views

Automatically show diff before saving file

I have a file that contains important information and I often have to make small changes in this file. Every once in a while I accidentally change something in this file and then save it without ...