X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fdiff-format.txt;h=9298d79e51bf87ccff66357227c7df4db4c820c4;hb=23bb8df2fb334368b6bd36908d13877cf6eae219;hp=d6ce035419081e3fbfc2375ac667517f5f52c980;hpb=5569bf9bbedd63a00780fc5c110e0cfab3aa97b9;p=git.git diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index d6ce0354..9298d79e 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -62,7 +62,7 @@ customization also applies to "git-diff-helper". 1. When the environment variable 'GIT_EXTERNAL_DIFF' is not set, these commands internally invoke "diff" like this: - diff -L a/ -L a/ -pu + diff -L a/ -L b/ -pu + For added files, `/dev/null` is used for . For removed files, `/dev/null` is used for @@ -101,7 +101,7 @@ For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1 parameter, . -Git specific extention to diff format +Git specific extension to diff format ------------------------------------- What -p option produces is slightly different from the