diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-05 04:31:09 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-05 04:31:09 +0300 |
| commit | e6f95113431f7e69263bc3d075c0a7715ce587e3 (patch) | |
| tree | 810569356f64b58df52560fcce0d3cfb561014ab /upload-pack.c | |
| parent | 784b11cd05e7862b0fbcc1251a65669c7004a8df (diff) | |
| parent | a249a9b5a26e841a28f6e993a560d749303cf91c (diff) | |
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 'upload-pack.c')
0 files changed, 0 insertions, 0 deletions