Questions tagged [diff]
diff is a shell command to find differences between two files. It is common on all *nix based systems
294
questions
1
vote
1
answer
1k
views
Watch + pipe + multiple arguments
I have a command diff -y <(xxd FILE) <(xxd FILE_) | colordiff and i want to put it into watch routine. Something like that:
watch -n 0,1 'diff -y <(xxd FILE) <(xxd FILE_)'
But i have an ...
- 13
2
votes
1
answer
593
views
Windows, How come Diff.exe reports an error?
We have 3 files in 3 directories:
d:\run.exe
d:\temp\RunShortcut = d:\run.exe
s:\temp\RunShortcut = d:\run.exe
The above 2 shortcut files are 433 bytes each and
shortcuts are present in ...
- 111
5
votes
1
answer
825
views
Is there a ZFS-aware diff?
I often make snapshots of a ZFS volume (containing AOSP) make some changes (often extracting ZIP files over then top, or running scripts) and then run diff to see what has changed.
This is really ...
- 195
31
votes
1
answer
10k
views
Git: Performing a diff between two stashes
Is it possible with Git to perform a diff between two stashes?
For instance, I have the following stashes:
stash@{2}: On peformanceFix#3: 20170728T164841
stash@{3}: On peformanceFix#2: ...
- 872
1
vote
1
answer
822
views
diff won't work recursively
I'm trying to recursively diff two directories using the command line diff util. I have two folders, diff1 and diff2, with contents like this:
diff2 is empty. But when I do diff -r diff1 diff2 I only ...
- 121
0
votes
0
answers
355
views
password is in clear text within ssh
I understand this is related to sshd_config below:
PasswordAuthentication yes
What I don't understand here is my command below:
diff <(ssh rx52019@hostname ls -R /home/rx52019 ) <(ls -R /home/...
- 101
-1
votes
1
answer
664
views
diff says files are different even after sync with rsync
To synchronise two directories, I run
diff -r -q path/to/dir1 path/to/dir2 1>/dev/null
if [[ $? == "0" ]]
then
echo "Directories are exact copies of each other"
else
rsync -av --delete path/to/...
- 101
0
votes
1
answer
2k
views
Object expected Microsoft JScript runtime error 800A138F when viewing diffs inside of TortoiseSVN update log
After I get an update, I double click a JavaScript file in my update log and get the following error message:
I've tried clearing everything inside of Settings -> Saved Data but I still get errors. I'...
- 254
0
votes
3
answers
6k
views
WinMerge says two files are identical when doing a diff on the directory, but comparing the files shows differences
I have two folders on my desktop, PreChanges and PostChanges.
PostChanges contains a few more files than PreChanges, but otherwise everything in one appears in the other.
If I use WinMerge to ...
- 887
3
votes
2
answers
2k
views
diff-so-fancy to compare files not under git version control
I really like the character-level highlighting of diff-so-fancy.
How can I use it to compare files without using git?
- 2,480
1
vote
1
answer
642
views
patch file based off single line
i have a file:
unreliable, random content, multiple lines
this_line_is_always_the_same_and_never_repeated_in_file
unreliable, random content, SINGLE line
unreliable, random content, multiple lines
...
- 13
0
votes
1
answer
603
views
Make doesn't find cmp even though it exists
Trying to run make in cygwin, I get the following error message:
$ make clean
Error: cmp command not found, please install diffutils
../../../../Makefile:489: recipe for target 'clean' failed
make: **...
- 605
2
votes
1
answer
3k
views
bash: why use "treat all files as text" flag with the diff command?
I see a few examples when using the diff command, particularly using it recursively for checking whole directories, to use "diff -ar foo/ foo2/".
If I'm checking a bunch of mixed files (some text, ...
- 141
8
votes
1
answer
36k
views
I forgot to activate Track Changes in a Word document. How to highlight my edits?
After I saved the document and closed Word, I realised that I forgot to activate Track Changes. I have a copy of the previous revision.
How can I highlight my (too many) edits before sending the ...
- 203
1
vote
1
answer
1k
views
Compare two documents, find similar sentences
I am trying to compare two text files documents (40 pages+) that seem to have similar sentences scattered around them. I would like to detect these similarities somehow. The first idea that popped ...
- 219