Merge branch 'js/refer-upstream'

diff --git a/attr.h b/attr.h
index 3a2f4ec1a09cca06fadedeb32bd86c5e279ad75c..450f49d648a013ffddc6321b7fd79b3fc1b66f7a 100644 (file)
--- a/attr.h
+++ b/attr.h
@@ -8,7 +8,7 @@ struct git_attr;
  * Given a string, return the gitattribute object that
  * corresponds to it.
  */
-struct git_attr *git_attr(const char *, int);
+struct git_attr *git_attr(const char *);
 
 /* Internal use */
 extern const char git_attr__true[];
@@ -33,7 +33,8 @@ int git_checkattr(const char *path, int, struct git_attr_check *);
 
 enum git_attr_direction {
        GIT_ATTR_CHECKIN,
-       GIT_ATTR_CHECKOUT
+       GIT_ATTR_CHECKOUT,
+       GIT_ATTR_INDEX,
 };
 void git_attr_set_direction(enum git_attr_direction, struct index_state *);