Thanks, I've reversed the behavior, switched the option to --log, verified the tests still pass and landed the branch to main.
$ git merge --ff-only wait-watch Updating 20533a7..3f278c0 Fast-forward ppa/ppa.py | 10 ++++++++-- scripts/ppa | 30 +++++++++++++++++++++++++++--- tests/test_scripts_ppa.py | 18 ++++++++++++++++++ 3 files changed, 53 insertions(+), 5 deletions(-) $ git push origin Enumerating objects: 21, done. Counting objects: 100% (21/21), done. Delta compression using up to 12 threads Compressing objects: 100% (12/12), done. Writing objects: 100% (14/14), 2.19 KiB | 2.19 MiB/s, done. Total 14 (delta 10), reused 0 (delta 0), pack-reused 0 To git+ssh://git.launchpad.net/ppa-dev-tools 20533a7..3f278c0 main -> main
« Back to merge proposal
Thanks, I've reversed the behavior, switched the option to --log, verified the tests still pass and landed the branch to main.
$ git merge --ff-only wait-watch +++++++ +++++++ ++++++- -- test_scripts_ ppa.py | 18 ++++++++++++++++++ //git.launchpad .net/ppa- dev-tools
Updating 20533a7..3f278c0
Fast-forward
ppa/ppa.py | 10 ++++++++--
scripts/ppa | 30 +++++++
tests/
3 files changed, 53 insertions(+), 5 deletions(-)
$ git push origin
Enumerating objects: 21, done.
Counting objects: 100% (21/21), done.
Delta compression using up to 12 threads
Compressing objects: 100% (12/12), done.
Writing objects: 100% (14/14), 2.19 KiB | 2.19 MiB/s, done.
Total 14 (delta 10), reused 0 (delta 0), pack-reused 0
To git+ssh:
20533a7..3f278c0 main -> main