diff options
| author | Elijah Newren <newren@gmail.com> | 2018-04-19 10:58:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 16:11:00 +0900 |
| commit | 79c47598f5c8c0008ae9281f20c2a041d4cabd93 (patch) | |
| tree | 889171881bb406243998cde584decd73fea00721 /commit.c | |
| parent | merge-recursive: apply necessary modifications for directory renames (diff) | |
| download | git-79c47598f5c8c0008ae9281f20c2a041d4cabd93.tar.gz git-79c47598f5c8c0008ae9281f20c2a041d4cabd93.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