Merge branch 'nd/object-allocation-comments'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Mar 2018 19:01:06 +0000 (12:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Mar 2018 19:01:06 +0000 (12:01 -0700)
Code doc update.

* nd/object-allocation-comments:
object.h: realign object flag allocation comment
object.h: update flag allocation comment

1  2 
builtin/index-pack.c
builtin/pack-objects.c
builtin/reflog.c
builtin/unpack-objects.c
object.h
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc object.h
Simple merge