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 /t/t4013/diff.format-patch_--inline_--stdout_initial..side | |
| parent | Merge branch 'maint' (diff) | |
| parent | Tell multi-parent diff about core.symlinks. (diff) | |
| download | git-e6f95113431f7e69263bc3d075c0a7715ce587e3.tar.gz git-e6f95113431f7e69263bc3d075c0a7715ce587e3.zip | |
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 't/t4013/diff.format-patch_--inline_--stdout_initial..side')
0 files changed, 0 insertions, 0 deletions