projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0a9b88b) | patch
Make branch merging aware of underlying case-insensitive filsystems
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 22 Mar 2008 16:35:59 +0000 (09:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Apr 2008 08:22:25 +0000 (01:22 -0700)
commit32260ad5dbc3100ebb5e05432198888bfbe600f8
treedba543f212ca43a1ab90e6a532de72098609c3f8tree | snapshot
parent0a9b88b7dee70bd36d35b7857640a18ee3adeef1commit | diff
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>
unpack-trees.c diff | blob | history
unpack-trees.h diff | blob | history
Git—the stupid content tracker