diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-23 22:24:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-23 22:24:01 -0800 |
| commit | 783cfafb91538c178d78a9f6c7b609e4f06582f8 (patch) | |
| tree | 242cb4414ba31ea251d701c8ebdf25f01ce3f4f8 /cache.h | |
| parent | 75a7ea258c0644b79e57cab3a345807f4017dfd2 (diff) | |
| parent | 0de8b94720501e869a05c52a691985fa4ce69803 (diff) | |
| download | git-783cfafb91538c178d78a9f6c7b609e4f06582f8.tar.gz git-783cfafb91538c178d78a9f6c7b609e4f06582f8.tar.xz | |
Merge branch 'cc/replace'
* cc/replace:
Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
Documentation: fix typos and spelling in replace documentation
replace: use a GIT_NO_REPLACE_OBJECTS env variable
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -369,6 +369,7 @@ static inline enum object_type object_type(unsigned int mode) #define CONFIG_ENVIRONMENT "GIT_CONFIG" #define EXEC_PATH_ENVIRONMENT "GIT_EXEC_PATH" #define CEILING_DIRECTORIES_ENVIRONMENT "GIT_CEILING_DIRECTORIES" +#define NO_REPLACE_OBJECTS_ENVIRONMENT "GIT_NO_REPLACE_OBJECTS" #define GITATTRIBUTES_FILE ".gitattributes" #define INFOATTRIBUTES_FILE "info/attributes" #define ATTRIBUTE_MACRO_PREFIX "[attr]" |