Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Custom low-level merge driver support.
[gitweb.git]
/
cache.h
diff --git
a/cache.h
b/cache.h
index 63af43fe5cb95a4fbcacb35c5910ab3930450877..38ad00661d5e0f5cc9f0d959c4c65c8c1ed238d9 100644
(file)
--- a/
cache.h
+++ b/
cache.h
@@
-153,6
+153,7
@@
enum object_type {
#define EXEC_PATH_ENVIRONMENT "GIT_EXEC_PATH"
#define GITATTRIBUTES_FILE ".gitattributes"
#define INFOATTRIBUTES_FILE "info/attributes"
+#define ATTRIBUTE_MACRO_PREFIX "[attr]"
extern int is_bare_repository_cfg;
extern int is_bare_repository(void);