summaryrefslogtreecommitdiffstats
path: root/diff-format.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-02-04 08:32:04 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-02-04 08:32:04 +0000
commitee1e428396a619659999df3e609e3d689173aaf5 (patch)
tree4887669f14cd36b9ffe70f49d535d3b4b1426284 /diff-format.txt
parent8a66a65638e314180d1e8aa89b35544b1800dc87 (diff)
downloadgit-htmldocs-ee1e428396a619659999df3e609e3d689173aaf5.tar.gz
Autogenerated HTML docs for v1.5.0-rc3-39-gec804
Diffstat (limited to 'diff-format.txt')
-rw-r--r--diff-format.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-format.txt b/diff-format.txt
index 883c1bb0a..378e72f38 100644
--- a/diff-format.txt
+++ b/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.