aboutsummaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-11 23:47:29 -0700
committerJunio C Hamano <gitster@pobox.com>2010-07-11 23:47:29 -0700
commit609eb9f7ff2af45d52ea90c0678a442d46aaa163 (patch)
treeffc41d47800a65665625835215e9e82020954f1a /Documentation/technical
parente13f38a33ed181b937c85fd9adf6bce755f69d00 (diff)
parent5d1e34158a3023af48541bf1731d202849929a12 (diff)
downloadgit-609eb9f7ff2af45d52ea90c0678a442d46aaa163.tar.gz
git-609eb9f7ff2af45d52ea90c0678a442d46aaa163.tar.xz
Merge branch 'maint'
* maint: Documentation: Spelling fix in protocol-capabilities.txt checkout: accord documentation to what git does t0005: work around strange $? in ksh when program terminated by a signal
Diffstat (limited to 'Documentation/technical')
-rw-r--r--Documentation/technical/protocol-capabilities.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/protocol-capabilities.txt b/Documentation/technical/protocol-capabilities.txt
index fd1a59314..b15517fa0 100644
--- a/Documentation/technical/protocol-capabilities.txt
+++ b/Documentation/technical/protocol-capabilities.txt
@@ -119,7 +119,7 @@ both.
ofs-delta
---------
-Server can send, and client understand PACKv2 with delta refering to
+Server can send, and client understand PACKv2 with delta referring to
its base by position in pack rather than by an obj-id. That is, they can
send/read OBJ_OFS_DELTA (aka type 6) in a packfile.