diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-02 11:27:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-02 11:27:13 -0800 |
| commit | 47f16e8b110d84bacb586a1b7183ee4bb781c980 (patch) | |
| tree | a95b90d7863c72c41ba825d21c21fc1daf0edbba /replace_object.c | |
| parent | 54d04f2b077496739f9fdf04ff8abf24feb33576 (diff) | |
| parent | 172b6428d06ff4eb0812f087a497d50b6c878fe1 (diff) | |
| download | git-47f16e8b110d84bacb586a1b7183ee4bb781c980.tar.gz | |
Merge branch 'cb/maint-orphan-merge-noclobber' into maint
* cb/maint-orphan-merge-noclobber:
do not overwrite untracked during merge from unborn branch
Diffstat (limited to 'replace_object.c')
0 files changed, 0 insertions, 0 deletions