Merge branch 'jc/maint-index-pack-keep'
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:29:29 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:29:29 +0000 (10:29 -0700)
"git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.

* 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