Darragh Bailey a7facb708a Let read-tree update index and tree ...

Remove the unnecessary additional call to 'git checkout' to update the
working tree to the current index when finishing the import merge. Add
the necessary options to the read-tree call to update both.

Additionally add some basic tests to ensure no behavioural change.

Change-Id: I4bd77aaf0b6c9b71e717d74db92af0d897d9c7b3

2014-10-21 13:57:22 +01:00

..

__init__.py

Rename hpgit to git-upstream, also changing its license

2014-03-03 14:32:26 +00:00

drop.py

Fixed pep8 errors

2014-07-15 12:22:20 +01:00

import.py

Let read-tree update index and tree

2014-10-21 13:57:22 +01:00

supersede.py

pep8 and whitespace fixups

2014-07-17 15:26:24 +01:00