mirror of
https://github.com/AGWA/git-crypt.git
synced 2025-12-25 20:34:15 -08:00
Tweak git-crypt usage message
* Change the wording for 'git-crypt lock'. * Move 'git-crypt lock' to 'Common commands' section since it's common to both GPG and symmetric mode. * Reduce whitespace in the output so it fits in 80 characters.
This commit is contained in:
@@ -48,25 +48,25 @@ static void print_usage (std::ostream& out)
|
||||
out << std::endl;
|
||||
// |--------------------------------------------------------------------------------| 80 characters
|
||||
out << "Common commands:" << std::endl;
|
||||
out << " init generate a key and prepare repo to use git-crypt" << std::endl;
|
||||
out << " status display which files are encrypted" << std::endl;
|
||||
//out << " refresh ensure all files in the repo are properly decrypted" << std::endl;
|
||||
out << " init generate a key and prepare repo to use git-crypt" << std::endl;
|
||||
out << " status display which files are encrypted" << std::endl;
|
||||
//out << " refresh ensure all files in the repo are properly decrypted" << std::endl;
|
||||
out << " lock de-configure git-crypt and re-encrypt files in working tree" << std::endl;
|
||||
out << std::endl;
|
||||
out << "GPG commands:" << std::endl;
|
||||
out << " add-gpg-key KEYID add the user with the given GPG key ID as a collaborator" << std::endl;
|
||||
//out << " rm-gpg-key KEYID revoke collaborator status from the given GPG key ID" << std::endl;
|
||||
//out << " ls-gpg-keys list the GPG key IDs of collaborators" << std::endl;
|
||||
out << " unlock decrypt this repo using the in-repo GPG-encrypted key" << std::endl;
|
||||
out << " lock check out encrypted versions of files in this repo" << std::endl;
|
||||
out << " add-gpg-key KEYID add the user with the given GPG key ID as a collaborator" << std::endl;
|
||||
//out << " rm-gpg-key KEYID revoke collaborator status from the given GPG key ID" << std::endl;
|
||||
//out << " ls-gpg-keys list the GPG key IDs of collaborators" << std::endl;
|
||||
out << " unlock decrypt this repo using the in-repo GPG-encrypted key" << std::endl;
|
||||
out << std::endl;
|
||||
out << "Symmetric key commands:" << std::endl;
|
||||
out << " export-key FILE export this repo's symmetric key to the given file" << std::endl;
|
||||
out << " unlock KEYFILE decrypt this repo using the given symmetric key" << std::endl;
|
||||
out << " export-key FILE export this repo's symmetric key to the given file" << std::endl;
|
||||
out << " unlock KEYFILE decrypt this repo using the given symmetric key" << std::endl;
|
||||
out << std::endl;
|
||||
out << "Legacy commands:" << std::endl;
|
||||
out << " init KEYFILE alias for 'unlock KEYFILE'" << std::endl;
|
||||
out << " keygen KEYFILE generate a git-crypt key in the given file" << std::endl;
|
||||
out << " migrate-key FILE migrate the given legacy key file to the latest format" << std::endl;
|
||||
out << " init KEYFILE alias for 'unlock KEYFILE'" << std::endl;
|
||||
out << " keygen KEYFILE generate a git-crypt key in the given file" << std::endl;
|
||||
out << " migrate-key FILE migrate the given legacy key file to the latest format" << std::endl;
|
||||
/*
|
||||
out << std::endl;
|
||||
out << "Plumbing commands (not to be used directly):" << std::endl;
|
||||
|
||||
Reference in New Issue
Block a user