summaryrefslogtreecommitdiff
path: root/ws.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-24 23:55:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-24 23:55:36 (GMT)
commit7d43de925b2771d295d8fc4341b7bd544e2a74fa (patch)
tree06cd429ed1ed04337eeaf23f6d72855fd94d3c0b /ws.c
parent01530432f73e7a29fbb9c4bc62aa88fba125ca7d (diff)
parent172b6428d06ff4eb0812f087a497d50b6c878fe1 (diff)
downloadgit-7d43de925b2771d295d8fc4341b7bd544e2a74fa.zip
git-7d43de925b2771d295d8fc4341b7bd544e2a74fa.tar.gz
git-7d43de925b2771d295d8fc4341b7bd544e2a74fa.tar.bz2
Merge branch 'cb/maint-orphan-merge-noclobber'
* cb/maint-orphan-merge-noclobber: do not overwrite untracked during merge from unborn branch
Diffstat (limited to 'ws.c')
0 files changed, 0 insertions, 0 deletions