Jason Haslam afab1fff01 checkout: handle dirty submodules correctly ...

Don't generate conflicts when checking out a modified submodule and the
submodule is dirty or modified in the workdir.

2016-05-26 01:11:34 -05:00

..

binaryunicode.c

Introduce cl_assert_equal_oid

2014-07-01 14:40:16 -04:00

checkout_helpers.c

win32: introduce p_timeval that isn't stupid

2016-02-12 10:34:15 -08:00

checkout_helpers.h

tests: tick the index when we count OID calculations

2015-06-16 08:51:45 +02:00

conflict.c

checkout test: mark unused vars

2015-06-30 14:31:07 +00:00

crlf.c

Fix some warnings

2015-11-20 20:48:51 +02:00

head.c

git_checkout_opts -> git_checkout_options

2014-03-06 09:44:51 -08:00

icase.c

Fix leaks in tests/checkout/icase

2015-06-12 09:28:47 -07:00

index.c

checkout test: Apply umask to file-mode test as well

2015-12-01 20:42:56 +01:00

nasty.c

win32: further cleanups for 8.3 disabling

2015-02-03 20:01:24 -05:00

tree.c

checkout: overwrite files with differing modes

2015-09-16 10:33:59 -04:00

typechange.c

checkout: handle dirty submodules correctly

2016-05-26 01:11:34 -05:00