ctome
/
tldr
mirror of https://github.com/CrimsonTome/tldr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

diff: clarified and elaborated examples (#3000)

italian
Alexander 2019-05-09 18:16:35 +02:00 committed by Andrik Albuquerque
parent a6837c71b8
commit 4fbd0a50ca
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pages/common/diff.md
View File

@ -2,26 +2,26 @@
> Compare files and directories.
- Compare files:
- Compare files (lists changes to turn `old_file` into `new_file`):
`diff {{file1}} {{file2}}`
`diff {{old_file}} {{new_file}}`
- Compare files, ignoring white spaces:
`diff -w {{file1}} {{file2}}`
`diff -w {{old_file}} {{new_file}}`
- Compare files, showing the differences side by side:
`diff -y {{file1}} {{file2}}`
`diff -y {{old_file}} {{new_file}}`
- Compare files, showing the differences in unified format (as used by `git diff`):
`diff -u {{file1}} {{file2}}`
`diff -u {{old_file}} {{new_file}}`
- Compare directories recursively:
- Compare directories recursively (shows names for differing files/directories as well as changes made to files):
`diff -r {{directory1}} {{directory2}}`
`diff -r {{old_directory}} {{new_directory}}`
- Compare directories, only showing the names of files that differ:
`diff -rq {{directory1}} {{directory2}}`
`diff -rq {{old_directory}} {{new_directory}}`