diff --git a/CHANGELOG.md b/CHANGELOG.md index 988c7f55b9..e8f3b832d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### New features ++ Add templater support for rendering commit signatures and update default + templates. + * Added support for commit signing and verification. This comes with out-of-the-box support for the following backends: * GnuPG diff --git a/docs/config.md b/docs/config.md index f9f63c305e..46aa1d35f2 100644 --- a/docs/config.md +++ b/docs/config.md @@ -521,8 +521,6 @@ the conflict is done, `jj` assumes that the conflict was only partially resolved and parses the conflict markers to get the new state of the conflict. The conflict is considered fully resolved when there are no conflict markers left. -<<<<<<< -+++++++ ## Commit Signing `jj` can be configured to sign and verify the commits it creates using either