From 96100f42d33787963b97aeee82024800724a09c0 Mon Sep 17 00:00:00 2001 From: Mehrad Mahmoudian Date: Mon, 20 Sep 2021 13:09:41 +0300 Subject: [PATCH] diff: add -Naur create patch file example (#6484) --- pages/common/diff.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pages/common/diff.md b/pages/common/diff.md index d2cb87b56..57d84d6f9 100644 --- a/pages/common/diff.md +++ b/pages/common/diff.md @@ -9,20 +9,24 @@ - Compare files, ignoring white spaces: -`diff -w {{old_file}} {{new_file}}` +`diff --ignore-all-space {{old_file}} {{new_file}}` - Compare files, showing the differences side by side: -`diff -y {{old_file}} {{new_file}}` +`diff --side-by-side {{old_file}} {{new_file}}` - Compare files, showing the differences in unified format (as used by `git diff`): -`diff -u {{old_file}} {{new_file}}` +`diff --unified {{old_file}} {{new_file}}` - Compare directories recursively (shows names for differing files/directories as well as changes made to files): -`diff -r {{old_directory}} {{new_directory}}` +`diff --recursive {{old_directory}} {{new_directory}}` - Compare directories, only showing the names of files that differ: -`diff -rq {{old_directory}} {{new_directory}}` +`diff --recursive --brief {{old_directory}} {{new_directory}}` + +- Create a patch file for Git from the differences of two text files, treating nonexistent files as empty: + +`diff --text --unified --new-file {{old_file}} {{new_file}} > {{diff.patch}}`