| commit | 32260ad5dbc3100ebb5e05432198888bfbe600f8 | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Sat, 22 Mar 2008 16:35:59 +0000 (22 09:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Apr 2008 08:22:25 +0000 (9 01:22 -0700) | ||
| tree | dba543f212ca43a1ab90e6a532de72098609c3f8 | treesnapshot (tar.gz zip) |
| parent | 0a9b88b7dee70bd36d35b7857640a18ee3adeef1 | commitdiff |
Make branch merging aware of underlying case-insensitive filsystems
If we find an unexpected file, see if that filename perhaps exists in a
case-insensitive way in the index, and whether the file matches that. If
so, ignore it as a known pre-existing file of a different name.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If we find an unexpected file, see if that filename perhaps exists in a
case-insensitive way in the index, and whether the file matches that. If
so, ignore it as a known pre-existing file of a different name.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| unpack-trees.c | diffblobblamehistory | |
| unpack-trees.h | diffblobblamehistory |