Merge branch 'jc/maint-index-pack-keep' into jc/index-pack
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Mar 2016 21:16:45 +0000 (13:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Mar 2016 21:16:45 +0000 (13:16 -0800)
commit13f0a6ddb94a16736000cb86f4cb39ed681e7c5d
tree305b4a1bf817f972838dfe26d41fbcccf15164e8
parentf02fbc4f9433937ee0463d0342d6d7d97e1f6f1e
parent0e94242df1ba11830c5443a55decaa041fa97710
Merge branch 'jc/maint-index-pack-keep' into jc/index-pack

* jc/maint-index-pack-keep:
  index-pack: correct --keep[=<msg>]
builtin/index-pack.c
t/t5300-pack-object.sh