Merge branch 'mh/attr'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:19:12 +0000 (21:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:19:12 +0000 (21:19 -0700)
* 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

1  2 
attr.c
diff --cc attr.c
Simple merge