Merge branch 'ne/pack-local-doc' into maint
commit162b4643b6104ad61ecc8b47e431161966796d85
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:36:00 +0000 (8 00:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:36:00 +0000 (8 00:36 -0800)
tree8b771e705ccfc3ecb5ab027230b8f92c130600af
parent919451330b55366ac207e575c1982bc8fa5220ed
parent18879bc52668123d75f0e03e27d5e731bf9b40ee
Merge branch 'ne/pack-local-doc' into maint

* ne/pack-local-doc:
  pack-objects documentation: Fix --honor-pack-keep as well.
  pack-objects documentation: reword "objects that appear in the standard input"
  Documentation: pack-objects: Clarify --local's semantics.