path: root/Documentation/diff-format.txt
diff options
authorJohannes Schindelin <>2005-08-05 15:05:02 (GMT)
committerJunio C Hamano <>2005-08-06 06:07:00 (GMT)
commit2c6e4771959dbe8116f39587d912f1215c06cd0d (patch)
tree4a0507fb450fc5c74ecc489701917f188a0a5077 /Documentation/diff-format.txt
parenteca35ecdcaa1448de8cc9ec64590f47a9012264a (diff)
[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 <>
Diffstat (limited to 'Documentation/diff-format.txt')
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index d6ce035..9298d79 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