tldr/pages/common/diff.md

37 lines
1.2 KiB
Markdown
Raw Normal View History

2014-02-02 12:26:10 +00:00
# diff
> Compare files and directories.
> More information: <https://man7.org/linux/man-pages/man1/diff.1.html>.
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
2024-03-16 14:12:22 +00:00
- Compare files, ignoring [w]hite spaces:
2014-02-02 12:26:10 +00:00
2024-03-16 14:12:22 +00:00
`diff {{-w|--ignore-all-space}} {{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
2024-03-16 14:12:22 +00:00
`diff {{-y|--side-by-side}} {{old_file}} {{new_file}}`
2014-02-02 12:26:10 +00:00
2024-03-16 14:12:22 +00:00
- Compare files, showing the differences in [u]nified format (as used by `git diff`):
2024-03-16 14:12:22 +00:00
`diff {{-u|--unified}} {{old_file}} {{new_file}}`
2024-03-16 14:12:22 +00:00
- Compare directories [r]ecursively (shows names for differing files/directories as well as changes made to files):
2014-02-02 12:26:10 +00:00
2024-03-16 14:12:22 +00:00
`diff {{-r|--recursive}} {{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
2024-03-16 14:12:22 +00:00
`diff {{-r|--recursive}} {{-q|--brief}} {{old_directory}} {{new_directory}}`
- Create a patch file for Git from the differences of two text files, treating nonexistent files as empty:
2024-03-16 14:12:22 +00:00
`diff {{-a|--text}} {{-u|--unified}} {{-N|--new-file}} {{old_file}} {{new_file}} > {{diff.patch}}`
- Compare files, showing output in color and try hard to find smaller set of changes:
`diff {{-d|--minimal}} --color=always {{old_file}} {{new_file}}`