Darragh Bailey 54d48766ae Always have rebase perform finish ...

To ensure consistent behaviour around encountering conflicts whether in
interactive mode or not, or whether there are changes to be carried or
not, always have rebase perform the finish step whenever the merge
behaviour is enabled.

Change-Id: I8f72ebb9fb0fa9fff4943e732cbf4f7d33672837
Related-Bug: #1625876

2016-09-30 17:46:02 +01:00

..

commands

Always have rebase perform finish

2016-09-30 17:46:02 +01:00

lib

Always have rebase perform finish

2016-09-30 17:46:02 +01:00

resources

Show rebase help during interactive import

2016-05-26 16:37:11 +01:00

tests

Always have rebase perform finish

2016-09-30 17:46:02 +01:00

__init__.py

Show rebase help during interactive import

2016-05-26 16:37:11 +01:00

errors.py

Rename hpgit to git-upstream, also changing its license

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

log.py

Support for python 3

2016-06-14 16:15:22 +01:00

main.py

Ensure parent options retained for exec'ed finish

2016-09-29 16:54:55 +01:00

rebase_editor.py

Fix broken interactive mode to be usable

2016-08-31 12:09:52 +01:00