mirror of
https://github.com/ivuorinen/cheatsheet-tldr.git
synced 2026-02-21 17:51:08 +00:00
Update cheatsheets
This commit is contained in:
18
tldr/diff
18
tldr/diff
@@ -11,32 +11,32 @@ source: https://github.com/tldr-pages/tldr.git
|
||||
|
||||
- Compare files (lists changes to turn `old_file` into `new_file`):
|
||||
|
||||
`diff {{old_file}} {{new_file}}`
|
||||
`diff {{path/to/old_file}} {{path/to/new_file}}`
|
||||
|
||||
- Compare files, ignoring white spaces:
|
||||
|
||||
`diff {{[-w|--ignore-all-space]}} {{old_file}} {{new_file}}`
|
||||
`diff {{[-w|--ignore-all-space]}} {{path/to/old_file}} {{path/to/new_file}}`
|
||||
|
||||
- Compare files, showing the differences side by side:
|
||||
|
||||
`diff {{[-y|--side-by-side]}} {{old_file}} {{new_file}}`
|
||||
`diff {{[-y|--side-by-side]}} {{path/to/old_file}} {{path/to/new_file}}`
|
||||
|
||||
- Compare files, showing the differences in unified format (as used by `git diff`):
|
||||
|
||||
`diff {{[-u|--unified]}} {{old_file}} {{new_file}}`
|
||||
`diff {{[-u|--unified]}} {{path/to/old_file}} {{path/to/new_file}}`
|
||||
|
||||
- Compare directories recursively (shows names for differing files/directories as well as changes made to files):
|
||||
|
||||
`diff {{[-r|--recursive]}} {{old_directory}} {{new_directory}}`
|
||||
`diff {{[-r|--recursive]}} {{path/to/old_directory}} {{path/to/new_directory}}`
|
||||
|
||||
- Compare directories, only showing the names of files that differ:
|
||||
|
||||
`diff {{[-r|--recursive]}} {{[-q|--brief]}} {{old_directory}} {{new_directory}}`
|
||||
`diff {{[-r|--recursive]}} {{[-q|--brief]}} {{path/to/old_directory}} {{path/to/new_directory}}`
|
||||
|
||||
- Create a patch file for Git from the differences of two text files, treating nonexistent files as empty:
|
||||
|
||||
`diff {{[-a|--text]}} {{[-u|--unified]}} {{[-N|--new-file]}} {{old_file}} {{new_file}} > {{diff.patch}}`
|
||||
`diff {{[-a|--text]}} {{[-u|--unified]}} {{[-N|--new-file]}} {{path/to/old_file}} {{path/to/new_file}} > {{path/to/diff.patch}}`
|
||||
|
||||
- Compare files, showing output in color and try hard to find smaller set of changes:
|
||||
- Compare files, showing output in color, trying hard to find the smallest set of changes:
|
||||
|
||||
`diff {{[-d|--minimal]}} --color=always {{old_file}} {{new_file}}`
|
||||
`diff {{[-d|--minimal]}} --color=always {{path/to/old_file}} {{path/to/new_file}}`
|
||||
|
||||
Reference in New Issue
Block a user