Darragh Bailey 6415738c1c Handle multiple non-contributing commits being merged ...

When encountering multiple non-contributing commits included in a merge
that is TREESAME to the existing contents, ensure a list of all commits
being brought in by that merge are included in the list to be pruned
from history.

Change-Id: I643e0923f8967f9b70d10b8796688b782681bfe0
Closes-Bug: #1648029

2017-03-31 10:33:18 +00:00

..

commands

Ensure logging is checked by most tests

2016-10-20 10:54:16 +01:00

lib

Handle multiple non-contributing commits being merged

2017-03-31 10:33:18 +00:00

resources

Show rebase help during interactive import

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

tests

Handle multiple non-contributing commits being merged

2017-03-31 10:33:18 +00: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

Simplify custom logging classes

2016-10-20 10:54:26 +01:00

main.py

Ensure correct prog name available to manpage

2016-11-01 13:03:02 +00:00

rebase_editor.py

Fix broken interactive mode to be usable

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