Merge with --gpg-sign option, and clarify that --no-gpg-sign also override earlier --gpg-sign. Signed-off-by: Đoàn Trần Công Danh <congdanhqx@xxxxxxxxx> --- Documentation/git-commit.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 13f653989f..6f6c06028b 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -350,11 +350,9 @@ changes to tracked files. --gpg-sign[=<keyid>]:: GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be - stuck to the option without a space. - ---no-gpg-sign:: - Countermand `commit.gpgSign` configuration variable that is - set to force each and every commit to be signed. + stuck to the option without a space. "--no-gpg-sign" is useful to + countermand both `commit.gpgSign` configuration variable, and + earlier "--gpg-sign". \--:: Do not interpret any more arguments as options. -- 2.26.0.334.g6536db25bb
