From 35a9822ba130613b7ae88d241df48556aaff01b3 Mon Sep 17 00:00:00 2001
From: Peter Grayson <pete@jpgrayson.net>
Date: Mon, 12 Dec 2022 11:17:03 -0500
Subject: [PATCH] chore: Update changelog for 2.1.0

---
 CHANGELOG.md | 24 ++++++++++++++++++++++++
 Cargo.lock   |  2 +-
 Cargo.toml   |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e95a683..e9704417 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Changelog
 
+## [2.1.0] 2022-12-12
+
+### Added
+- feat: Configurable push conflict policy (#60)
+- feat: Add --committer-date-is-author-date option (#47)
+- feat(import): Add --3way option (#36)
+- feat(import): Add --directory option (#36)
+
+### Changed
+- feat!: Relaxed stack initialization (#238)
+- feat!: Only sign stack based on stgit.gpgsign (#238)
+- fix!: Allow "---" separator in messages (#243)
+- feat: More descriptive push conflict message (#60)
+- feat: Avoid post-edit commits when no change
+- chore: Update dependencies to latest versions
+
+### Fixed
+- fix: Improved error message for uninitialized stack
+- fix: Improve error for re-initialization attempt
+- fix(prev): Different error message for empty stack
+- fix: Accept full ref name for branches
+- fix(zsh): Complete --edit and --diff for stg new
+
+
 ## [2.0.4] 2022-11-30
 
 ### Changed
diff --git a/Cargo.lock b/Cargo.lock
index 23bfa568..f95b96b0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -698,7 +698,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "stgit"
-version = "2.0.4"
+version = "2.1.0"
 dependencies = [
  "anyhow",
  "bstr",
diff --git a/Cargo.toml b/Cargo.toml
index be93c422..4b996e44 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stgit"
-version = "2.0.4"
+version = "2.1.0"
 edition = "2021"
 rust-version = "1.63.0"
 authors = [