Merge branch 'nd/object-allocation-comments' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 Mar 2018 21:34:16 +0000 (13:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Mar 2018 21:34:16 +0000 (13:34 -0800)
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