diff options
| author | Russell Belfer <arrbee@arrbee.com> | 2012-01-17 03:16:44 +0400 |
|---|---|---|
| committer | Russell Belfer <arrbee@arrbee.com> | 2012-01-17 03:16:44 +0400 |
| commit | cfbc880d8a407bcd2074dda4221d337daf72195c (patch) | |
| tree | eb1cd2d1be66c2b5604fbe3699b38aae984851b3 /src/attr_file.h | |
| parent | 1dbcc9fc4e6f5264d5bb46f6d7f744eb4a4063e4 (diff) | |
Patch cleanup for merge
After reviewing the gitignore support with Vicent, we came up
with a list of minor cleanups to prepare for merge, including:
* checking git_repository_config error returns
* renaming git_ignore_is_ignored and moving to status.h
* fixing next_line skipping to include \r skips
* commenting on where ignores are and are not included
Diffstat (limited to 'src/attr_file.h')
| -rw-r--r-- | src/attr_file.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/attr_file.h b/src/attr_file.h index 86836b56f..7190c4c7b 100644 --- a/src/attr_file.h +++ b/src/attr_file.h @@ -11,6 +11,11 @@ #include "vector.h" #include "hashtable.h" +#define GIT_ATTR_FILE ".gitattributes" +#define GIT_ATTR_FILE_INREPO "info/attributes" +#define GIT_ATTR_FILE_SYSTEM "gitattributes" +#define GIT_ATTR_CONFIG "core.attributesfile" + #define GIT_ATTR_FNMATCH_NEGATIVE (1U << 0) #define GIT_ATTR_FNMATCH_DIRECTORY (1U << 1) #define GIT_ATTR_FNMATCH_FULLPATH (1U << 2) |