Merge branch 'ne/pack-local-doc'
commit27a23031056fbd540f7c34d78a3f097a3a7c211c
authorJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 20:47:16 +0000 (7 12:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 20:47:16 +0000 (7 12:47 -0800)
treec73bdb50057530b35ed97c16377c836af7fc5217
parent0d1f2a56b1f83a6d298e5c03bfe76a47caa753c2
parent18879bc52668123d75f0e03e27d5e731bf9b40ee
Merge branch 'ne/pack-local-doc'

* 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.