From 2c6e4771959dbe8116f39587d912f1215c06cd0d Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 5 Aug 2005 17:05:02 +0200 Subject: [PATCH] Assorted documentation patches [jc: Johannes spent time and effort to see how consistent our use of terminilogy is, and as a byproduct made these corrections not related to the terminology unification. I really appreciate it.] Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- Documentation/diff-format.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/diff-format.txt') diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index d6ce035419..9298d79e51 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 -- cgit v1.3-6-g1900