Jason Haslam 70681ff740 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-10-01 17:40:35 +02:00

..

checkout-internals.md

checkout: handle dirty submodules correctly

2016-10-01 17:40:35 +02:00

diff-internals.md

fix typos in docs

2013-12-01 10:35:56 +01:00

error-handling.md

Fix docs typo geterr_clear -> giterr_clear

2015-10-26 10:21:09 -07:00

merge-df_conflicts.txt

merge!

2013-04-30 15:31:31 -05:00