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
This commit is contained in:
Junio C Hamano
2010-07-11 23:47:29 -07:00
3 changed files with 3 additions and 2 deletions

View File

@ -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.