Merge branch 'jc/show-branch' into pu
commita7bd6f0df8ca623c8071b932faf6b2095d5ad609
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 21:09:03 +0000 (25 14:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 21:09:03 +0000 (25 14:09 -0700)
tree153e42ab48992d8e56b26116a05f28be2adb10cd
parentdc4e303196d23178bceb01a8a4efb1ee2696f482
parentcc1cbe0e2f168b127af3a83c58462408a133a8ce
Merge branch 'jc/show-branch' into pu

* jc/show-branch:
  show-branch: use commit slab to represent bitflags of arbitrary width
  show-branch.c: remove "all_mask"
  show-branch.c: abstract out "flags" operation
  show-branch.c: lift all_mask/all_revs to a global static
  show-branch.c: update comment style
builtin/show-branch.c