diff options
author | Junio C Hamano <junkio@cox.net> | 2007-03-04 17:31:09 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-03-04 17:31:09 -0800 |
commit | e6f95113431f7e69263bc3d075c0a7715ce587e3 (patch) | |
tree | 810569356f64b58df52560fcce0d3cfb561014ab /environment.c | |
parent | 784b11cd05e7862b0fbcc1251a65669c7004a8df (diff) | |
parent | a249a9b5a26e841a28f6e993a560d749303cf91c (diff) | |
download | git-e6f95113431f7e69263bc3d075c0a7715ce587e3.tar.gz git-e6f95113431f7e69263bc3d075c0a7715ce587e3.tar.xz |
Merge branch 'js/symlink'
* js/symlink:
Tell multi-parent diff about core.symlinks.
Handle core.symlinks=false case in merge-recursive.
Add core.symlinks to mark filesystems that do not support symbolic links.
Diffstat (limited to 'environment.c')
-rw-r--r-- | environment.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c index 570e32ac3..49486dd9f 100644 --- a/environment.c +++ b/environment.c @@ -13,6 +13,7 @@ char git_default_email[MAX_GITNAME]; char git_default_name[MAX_GITNAME]; int use_legacy_headers = 1; int trust_executable_bit = 1; +int has_symlinks = 1; int assume_unchanged; int prefer_symlink_refs; int is_bare_repository_cfg = -1; /* unspecified */ |