From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Aug 2011 04:19:12 +0000 (-0700)
Subject: Merge branch 'mh/attr'
X-Git-Tag: v1.7.7-rc1~40
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e5cfcb04e0acc5f3b51e6d69487028315b33e4c9;p=git.git

Merge branch 'mh/attr'

* mh/attr:
  Unroll the loop over passes
  Change while loop into for loop
  Determine the start of the states outside of the pass loop
  Change parse_attr() to take a pointer to struct attr_state
  Increment num_attr in parse_attr_line(), not parse_attr()
  Document struct match_attr
  Add a file comment
---

e5cfcb04e0acc5f3b51e6d69487028315b33e4c9