Merge branches 'jc/clone', 'md/env' and 'mo/path'

diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index 9628183143319544efbc93bc8f2090b8af3163b1..2d67d3911ed9e6081534f5311b0a76c632f73a6d 100644 (file)
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -1,6 +1,5 @@
 git-pack-objects(1)
 ===================
-v0.1, July 2005
 
 NAME
 ----
@@ -9,7 +8,7 @@ git-pack-objects - Create a packed archive of objects.
 
 SYNOPSIS
 --------
-'git-pack-objects' [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list
+'git-pack-objects' [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list
 
 
 DESCRIPTION
@@ -31,7 +30,7 @@ transport by their peers.
 
 Placing both in the pack/ subdirectory of $GIT_OBJECT_DIRECTORY (or
 any of the directories on $GIT_ALTERNATE_OBJECT_DIRECTORIES)
-enables GIT to read from such an archive.
+enables git to read from such an archive.
 
 
 OPTIONS
@@ -47,7 +46,7 @@ base-name::
        output of the command.
 
 --stdout::
-       Write the pack contents (what would have been writtin to
+       Write the pack contents (what would have been written to
        .pack file) out to the standard output.
 
 --window and --depth::
@@ -65,6 +64,15 @@ base-name::
        This flag causes an object already in a pack ignored
        even if it appears in the standard input.
 
+--local::
+       This flag is similar to `--incremental`; instead of
+       ignoring all packed objects, it only ignores objects
+       that are packed and not in the local object store
+       (i.e. borrowed from an alternate).
+
+--non-empty::
+        Only create a packed archive if it would contain at
+        least one object.
 
 Author
 ------
@@ -74,7 +82,12 @@ Documentation
 -------------
 Documentation by Junio C Hamano
 
+See-Also
+--------
+gitlink:git-repack[1]
+gitlink:git-prune-packed[1]
+
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite