From 64828b8ff939a487954978629dd5a58d15516bae Mon Sep 17 00:00:00 2001 From: Julien Vincent Date: Sun, 25 Feb 2024 17:24:31 +0000 Subject: [PATCH] sign: Update CHANGELOG --- CHANGELOG.md | 3 +++ docs/config.md | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ebcb160c34..4994b1071d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * `ui.default-command` now accepts multiple string arguments, for more complex default `jj` commands. ++ Add templater support for rendering commit signatures and updated default + templates. + ### Fixed bugs ## [0.15.1] - 2024-03-06 diff --git a/docs/config.md b/docs/config.md index dfe41f60a25..a4c8bf68639 100644 --- a/docs/config.md +++ b/docs/config.md @@ -522,8 +522,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