summaryrefslogtreecommitdiff
path: root/Documentation/diff-format.txt
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2007-02-03 23:49:16 -0500
committerJunio C Hamano <junkio@cox.net>2007-02-03 21:49:54 -0800
commit3dff5379bf1e3fda5e5a84ca5813b0c0cfd51be7 (patch)
tree86fe6fa503b65e19b37dceb5b7613602267a9bb1 /Documentation/diff-format.txt
parent0f3908758947b2279f5d2d4a294653d76a62d468 (diff)
downloadgit-3dff5379bf1e3fda5e5a84ca5813b0c0cfd51be7.tar.gz
Assorted typo fixes
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/diff-format.txt')
-rw-r--r--Documentation/diff-format.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 883c1bb0a6..378e72f38f 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -159,7 +159,7 @@ or like this (when '--cc' option is used):
deleted file mode <mode>,<mode>
+
The `mode <mode>,<mode>..<mode>` line appears only if at least one of
-the <mode> is diferent from the rest. Extended headers with
+the <mode> is different from the rest. Extended headers with
information about detected contents movement (renames and
copying detection) are designed to work with diff of two
<tree-ish> and are not used by combined diff format.