tldr/pages/common/diff.md

28 lines
716 B
Markdown
Raw Normal View History

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