diff options
| author | Elijah Newren <newren@gmail.com> | 2018-02-14 10:52:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 14:11:58 -0800 |
| commit | 7b3d3b06811c3d603d47d50eb3c8775571845a80 (patch) | |
| tree | fc58e4f6e20da1265d3656935fc3487e8ee70a0c /commit.c | |
| parent | merge-recursive: apply necessary modifications for directory renames (diff) | |
| download | git-7b3d3b06811c3d603d47d50eb3c8775571845a80.tar.gz git-7b3d3b06811c3d603d47d50eb3c8775571845a80.zip | |
merge-recursive: avoid clobbering untracked files with directory renames
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions