diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-24 15:55:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-24 15:55:36 -0800 |
| commit | 7d43de925b2771d295d8fc4341b7bd544e2a74fa (patch) | |
| tree | 06cd429ed1ed04337eeaf23f6d72855fd94d3c0b /upload-pack.c | |
| parent | 01530432f73e7a29fbb9c4bc62aa88fba125ca7d (diff) | |
| parent | 172b6428d06ff4eb0812f087a497d50b6c878fe1 (diff) | |
| download | git-7d43de925b2771d295d8fc4341b7bd544e2a74fa.tar.gz | |
Merge branch 'cb/maint-orphan-merge-noclobber'
* cb/maint-orphan-merge-noclobber:
do not overwrite untracked during merge from unborn branch
Diffstat (limited to 'upload-pack.c')
0 files changed, 0 insertions, 0 deletions