diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-01-07 22:43:27 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-07 14:02:00 -0800 |
| commit | f1cdcc70dc654a5364871a8712c073a610b6027b (patch) | |
| tree | ae3ed2aa3786102c2539ef14fb666253b01e3b1e /Documentation | |
| parent | b2e62a7dc6ba20a354d7590bf6a1d9264de7efe3 (diff) | |
| download | git-f1cdcc70dc654a5364871a8712c073a610b6027b.tar.gz | |
Documentation: typofix
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitcli.txt | 2 | ||||
| -rw-r--r-- | Documentation/technical/api-diff.txt | 6 | ||||
| -rw-r--r-- | Documentation/technical/pack-format.txt | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index a4703cd7c1..7ee5ce386f 100644 --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@ -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 diff --git a/Documentation/technical/api-diff.txt b/Documentation/technical/api-diff.txt index 822609bcd1..83b007e708 100644 --- a/Documentation/technical/api-diff.txt +++ b/Documentation/technical/api-diff.txt @@ -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 @@ -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;; diff --git a/Documentation/technical/pack-format.txt b/Documentation/technical/pack-format.txt index a80baa4382..aa87756a55 100644 --- a/Documentation/technical/pack-format.txt +++ b/Documentation/technical/pack-format.txt @@ -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). |