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)
* jc/maint-index-pack-keep:
  index-pack: correct --keep[=<msg>]

1  2 
builtin/index-pack.c
t/t5300-pack-object.sh

Simple merge
Simple merge