aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-archive.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-21 23:24:46 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-21 23:24:46 -0700
commit88f78ce8433ddf2f498cdcac33fed2c71f820cbd (patch)
tree3fe36f5e672afbf2cf67ac49a6b09c959252ce2f /Documentation/git-archive.txt
parentd291a9a6c8165efee95b3c1ceb814c39460ddbea (diff)
parent4306bcb4e14ab708f0083bcf0339fa77a4005c05 (diff)
downloadgit-88f78ce8433ddf2f498cdcac33fed2c71f820cbd.tar.gz
git-88f78ce8433ddf2f498cdcac33fed2c71f820cbd.tar.xz
Merge branch 'dm/maint-docco'
* dm/maint-docco: Documentation: reword example text in git-bisect.txt. Documentation: reworded the "Description" section of git-bisect.txt. Documentation: minor grammatical fixes in git-branch.txt. Documentation: minor grammatical fixes in git-blame.txt. Documentation: reword the "Description" section of git-bisect.txt. Documentation: minor grammatical fixes in git-archive.txt.
Diffstat (limited to 'Documentation/git-archive.txt')
-rw-r--r--Documentation/git-archive.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 0eeefe006..c1adf5949 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -23,7 +23,7 @@ prepended to the filenames in the archive.
'git-archive' behaves differently when given a tree ID versus when
given a commit ID or tag ID. In the first case the current time is
-used as modification time of each file in the archive. In the latter
+used as the modification time of each file in the archive. In the latter
case the commit time as recorded in the referenced commit object is
used instead. Additionally the commit ID is stored in a global
extended pax header if the tar format is used; it can be extracted
@@ -52,11 +52,11 @@ OPTIONS
Write the archive to <file> instead of stdout.
<extra>::
- This can be any options that the archiver backend understand.
+ This can be any options that the archiver backend understands.
See next section.
--remote=<repo>::
- Instead of making a tar archive from local repository,
+ Instead of making a tar archive from the local repository,
retrieve a tar archive from a remote repository.
--exec=<git-upload-archive>::
@@ -109,7 +109,7 @@ EXAMPLES
git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)::
Create a tar archive that contains the contents of the
- latest commit on the current branch, and extracts it in
+ latest commit on the current branch, and extract it in the
`/var/tmp/junk` directory.
git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz::