summaryrefslogtreecommitdiff
path: root/Documentation/diff-format.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-12-29 01:20:06 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2005-12-29 01:32:56 -0800
commit89438677abaae1a8ffc3c0905f3355a590da7bf4 (patch)
treef1d43ab8459bcc2010220c32c03001e7588b26f6 /Documentation/diff-format.txt
parentFix skipping merge-order test with NO_OPENSSL=1. (diff)
downloadtgif-89438677abaae1a8ffc3c0905f3355a590da7bf4.tar.xz
Documentation: spell.
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 97756ec030..0398b408c0 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -117,7 +117,7 @@ git specific extension to diff format
What -p option produces is slightly different from the
traditional diff format.
-1. It is preceeded with a "git diff" header, that looks like
+1. It is preceded with a "git diff" header, that looks like
this:
diff --git a/file1 b/file2