Sync with 1.7.4.3

diff --combined Documentation/git-pack-objects.txt
index 442018bcb8f14dbb7572ad87a3c1adb588444278,96684bc51003485974424d1b00d060a7f8e5e59e..08c89d221cef9215806e4ef4dfda97898fe44942
--- 1/Documentation/git-pack-objects.txt
--- 2/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@@ -192,13 -192,18 +192,18 @@@ self-contained. Use `git index-pack --f
  --delta-base-offset::
        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
+       stream, but ancient 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
        compactness.  Depending on the average delta chain
        length, this option typically shrinks the resulting
        packfile by 3-5 per-cent.
+ +
+ Note: Porcelain commands such as `git gc` (see linkgit:git-gc[1]),
+ `git repack` (see linkgit:git-repack[1]) pass this option by default
+ in modern git when they put objects in your repository into pack files.
+ So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle.
  
  --threads=<n>::
        Specifies the number of threads to spawn when searching for best
@@@ -219,6 -224,15 +224,6 @@@
        With this option, parents that are hidden by grafts are packed
        nevertheless.
  
 -
 -Author
 -------
 -Written by Linus Torvalds <torvalds@osdl.org>
 -
 -Documentation
 --------------
 -Documentation by Junio C Hamano
 -
  SEE ALSO
  --------
  linkgit:git-rev-list[1]