summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-22 22:45:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-22 22:45:10 (GMT)
commit66a80c333ebe2509d5dcadbd2ee244c53fe73e1e (patch)
treec694a863cb39c582ad8b05aa2828eec638ed81e8 /builtin/merge.c
parent2416803b6cea2bc56ea29fe767a916572f2fc89e (diff)
parente53a64b982bd1351ad165c9ce6077c66fcc7118b (diff)
downloadgit-66a80c333ebe2509d5dcadbd2ee244c53fe73e1e.zip
git-66a80c333ebe2509d5dcadbd2ee244c53fe73e1e.tar.gz
git-66a80c333ebe2509d5dcadbd2ee244c53fe73e1e.tar.bz2
Merge branch 'ad/cygwin-wants-rename'
On Cygwin, object creation uses the "create a temporary and then rename it to the final name" pattern, not "create a temporary, hardlink it to the final name and then unlink the temporary" pattern. This is necessary to use Git on Windows shared directories, and is already enabled for the MinGW and plain Windows builds. It also has been used in Cygwin packaged versions of Git for quite a while. See http://thread.gmane.org/gmane.comp.version-control.git/291853 ($gmane/275680, $gmane/291853). * ad/cygwin-wants-rename: config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions