Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix keyfile from/to parameter collision #3961

Merged
merged 1 commit into from Dec 21, 2019
Merged

Fix keyfile from/to parameter collision #3961

merged 1 commit into from Dec 21, 2019

Commits on Dec 21, 2019

  1. CLI: Fix keyfile from/to parameter collision in merge command 

    Rename 'k' to 'f' because 'k' is already used to specify the key for the target database of the merge

* Remove short -f option from keepassxc-cli.1
* Remove -f option from keepassxc-cli merge
* Add test cases covering cli options for merge
* Add functional test for merge with keys
    @wizzk42 @droidmonkey
    wizzk42 authored and droidmonkey committed Dec 21, 2019
    Copy the full SHA
    df438b2 View commit details
    Browse the repository at this point in the history