diff options
Diffstat (limited to 'Documentation/diff-format.txt')
| -rw-r--r-- | Documentation/diff-format.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index d6ce03541..9298d79e5 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/<path> -L a/<path> -pu <old> <new> + diff -L a/<path> -L b/<path> -pu <old> <new> + For added files, `/dev/null` is used for <old>. For removed files, `/dev/null` is used for <new> @@ -101,7 +101,7 @@ For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1 parameter, <path>. -Git specific extention to diff format +Git specific extension to diff format ------------------------------------- What -p option produces is slightly different from the |