diff --git a/.gitattributes b/.gitattributes index 3cbfccb2..67b13198 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,10 @@ # Excluding from GitHub languages: vendor/ linguist-vendored +# Excluding from GitHub diff: +*.1 linguist-generated +*.7 linguist-generated + # Excluding from `git diff`: *.1 -diff *.7 -diff diff --git a/man/man1/git-secret-hide.1 b/man/man1/git-secret-hide.1 index e12d311a..ae087a7e 100644 --- a/man/man1/git-secret-hide.1 +++ b/man/man1/git-secret-hide.1 @@ -15,7 +15,7 @@ git secret hide [\-c] [\-F] [\-P] [\-v] [\-d] [\-m] .fi . .SH "DESCRIPTION" -\fBgit\-secret\-hide\fR creates an encrypted version (typically called \fBfilename\.txt\.secret\fR) of each file added by \fBgit\-secret\-add\fR command\. Now anyone enabled via \'git secret tell\' can can decrypt these files\. Under the hood, \fBgit\-secret\fR uses the keyring in \fB\.gitsecret/keys\fR and user\'s secret keys to decrypt the files\. +\fBgit\-secret\-hide\fR creates an encrypted version (typically called \fBfilename\.txt\.secret\fR) of each file added by \fBgit\-secret\-add\fR command\. Now anyone enabled via \fBgit secret tell\fR can can decrypt these files\. Under the hood, \fBgit\-secret\fR uses the keyring in \fB\.gitsecret/keys\fR and user\'s secret keys to decrypt the files\. . .P It is recommended to encrypt (or re\-encrypt) all the files in a \fBgit\-secret\fR repo each time \fBgit secret hide\fR is run\. diff --git a/man/man1/git-secret-hide.1.md b/man/man1/git-secret-hide.1.md index c2216534..64f8bca3 100644 --- a/man/man1/git-secret-hide.1.md +++ b/man/man1/git-secret-hide.1.md @@ -9,7 +9,7 @@ git-secret-hide - encrypts all added files with the inner keyring. ## DESCRIPTION `git-secret-hide` creates an encrypted version (typically called `filename.txt.secret`) of each file added by `git-secret-add` command. -Now anyone enabled via 'git secret tell' can can decrypt these files. Under the hood, +Now anyone enabled via `git secret tell` can can decrypt these files. Under the hood, `git-secret` uses the keyring in `.gitsecret/keys` and user's secret keys to decrypt the files. It is recommended to encrypt (or re-encrypt) all the files in a `git-secret` repo each diff --git a/man/man7/git-secret.7 b/man/man7/git-secret.7 index fc5d2fa4..8c46e0bb 100644 --- a/man/man7/git-secret.7 +++ b/man/man7/git-secret.7 @@ -13,7 +13,7 @@ These steps cover the basic process of using \fBgit\-secret\fR: Before starting, \fImake sure you have created a \fBgpg\fR RSA key\-pair\fR: a public and a secret key identified by your email address\. . .IP "2." 4 -Begin with an existing or new git repository\. You\'ll use the \'git\-secret\' commands to add the keyrings and information to make \fBgit\-secret\fR hide and reveal files in this repository\. +Begin with an existing or new git repository\. You\'ll use the \fBgit\-secret\fR commands to add the keyrings and information to make \fBgit\-secret\fR hide and reveal files in this repository\. . .IP "3." 4 Initialize the \fBgit\-secret\fR repository by running \fBgit secret init\fR command\. The \fB\.gitsecret/\fR folder will be created\. \fBNote\fR all the contents of the \fB\.gitsecret/\fR folder should be checked in, \fB/except/\fR the \fBrandom_seed\fR file\. In other words, of all the files in \fB\.gitsecret/\fR, only the \fBrandom_seed\fR file should be mentioned in your \fB\.gitignore\fR file\. By default, \fBgit secret init\fR will add the file \fB\.gitsecret/keys/random_seed\fR to your \fB\.gitignore\fR file\. diff --git a/man/man7/git-secret.7.md b/man/man7/git-secret.7.md index 4f6df25a..cc010e7a 100644 --- a/man/man7/git-secret.7.md +++ b/man/man7/git-secret.7.md @@ -7,7 +7,7 @@ These steps cover the basic process of using `git-secret`: 0. Before starting, [make sure you have created a `gpg` RSA key-pair](#using-gpg): a public and a secret key identified by your email address. -1. Begin with an existing or new git repository. You'll use the 'git-secret' commands to add the keyrings and information +1. Begin with an existing or new git repository. You'll use the `git-secret` commands to add the keyrings and information to make `git-secret` hide and reveal files in this repository. 2. Initialize the `git-secret` repository by running `git secret init` command. The `.gitsecret/` folder will be created.