summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-30 21:10:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-30 21:10:41 (GMT)
commit17a02998078923f2d62811326d130de991d1a95a (patch)
treef33b6e5758233f3f7ae05fe0d8565323de381820 /Documentation
parent44a9cedb005b0b8be31dccd8e6ddf97074a01345 (diff)
parent806e0aba2e5d976233703e6ff517af10329e4048 (diff)
downloadgit-17a02998078923f2d62811326d130de991d1a95a.zip
git-17a02998078923f2d62811326d130de991d1a95a.tar.gz
git-17a02998078923f2d62811326d130de991d1a95a.tar.bz2
Merge branch 'maint'
* maint: contrib/thunderbird-patch-inline: do not require bash to run the script t8001: check the exit status of the command being tested strbuf.h: remove a tad stale docs-in-comment and reference api-doc instead Typos: t/README Documentation/config.txt: make truth value of numbers more explicit git-pack-objects.txt: fix grammatical errors parse-remote: replace unnecessary sed invocation
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt2
-rw-r--r--Documentation/git-pack-objects.txt6
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 8ea55d4..52ffbf4 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -62,7 +62,7 @@ Internal whitespace within a variable value is retained verbatim.
The values following the equals sign in variable assign are all either
a string, an integer, or a boolean. Boolean values may be given as yes/no,
-0/1, true/false or on/off. Case is not significant in boolean values, when
+1/0, true/false or on/off. Case is not significant in boolean values, when
converting value to the canonical form using '--bool' type specifier;
'git config' will ensure that the output is "true" or "false".
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index a51071e..442018b 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -190,9 +190,9 @@ self-contained. Use `git index-pack --fix-thin`
(see linkgit:git-index-pack[1]) to restore the self-contained property.
--delta-base-offset::
- A packed archive can express base object of a delta as
- either 20-byte object name or as an offset in the
- stream, but older version of git does not understand the
+ A packed archive can express the base object of a delta as
+ either a 20-byte object name or as an offset in the
+ stream, but older versions of git don't understand the
latter. By default, 'git pack-objects' only uses the
former format for better compatibility. This option
allows the command to use the latter format for