diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:19:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:19:12 -0700 |
| commit | e5cfcb04e0acc5f3b51e6d69487028315b33e4c9 (patch) | |
| tree | 02297f4bb6d65645f02ef53c82d2d9ccab180862 /combine-diff.c | |
| parent | 0dc691a4f3dcb67dd948eb97efcf7098059988c1 (diff) | |
| parent | d68e1c183c056ae583a45b610d086ac078886154 (diff) | |
| download | git-e5cfcb04e0acc5f3b51e6d69487028315b33e4c9.tar.gz | |
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
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions