Skip to content

Commit

Permalink
Documentation: typofix
Browse files Browse the repository at this point in the history
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Ralf Wildenhues authored and Junio C Hamano committed Jan 7, 2008
1 parent b2e62a7 commit f1cdcc7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Documentation/gitcli.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ $ git foo -oArg
$ git foo -o Arg
----------------------------

However, this is *NOT* allowed for switches with an optionnal value, where the
However, this is *NOT* allowed for switches with an optional value, where the
'sticked' form must be used:
----------------------------
$ git describe --abbrev HEAD # correct
Expand Down
6 changes: 3 additions & 3 deletions Documentation/technical/api-diff.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@ Notable members are:
and copies.

`abbrev`::
Number of hexdigits to abbrevate raw format output to.
Number of hexdigits to abbreviate raw format output to.

`pickaxe`::
A constant string (can and typically does contain newlines to
look for a block of text, not just a single line) to filter out
the filepairs that do not change the number of strings contained
in its preimage and postmage of the diff_queue.
in its preimage and postimage of the diff_queue.

`flags`::
This is mostly a collection of boolean options that affects the
Expand Down Expand Up @@ -149,7 +149,7 @@ REVERSE_DIFF;;

EXIT_WITH_STATUS;;
For communication between the calling program and the options
parser; tell the calling program to signal the presense of
parser; tell the calling program to signal the presence of
difference using program exit code.

HAS_CHANGES;;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/technical/pack-format.txt
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ Pack file entry: <+

- A table of 4-byte CRC32 values of the packed object data.
This is new in v2 so compressed data can be copied directly
from pack to pack during repacking withough undetected
from pack to pack during repacking without undetected
data corruption.

- A table of 4-byte offset values (in network byte order).
Expand Down

0 comments on commit f1cdcc7

Please sign in to comment.