From 7b3c65e45db5c8cb353d55bd0b03131562ad049a Mon Sep 17 00:00:00 2001
From: Peter Grayson <pete@jpgrayson.net>
Date: Wed, 6 Jul 2022 14:26:32 -0400
Subject: [PATCH] Update changelog for 2.0.0-alpha.2

Also add a bullet for the new alias system in the 2.0.0-alpha.0 notes.
---
 CHANGELOG.md | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 Cargo.lock   |  2 +-
 Cargo.toml   |  2 +-
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6916a2a..7d54069a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,44 @@
 # Changelog
 
-## [2.0.0-alpha.1] 2022-06-17
+## [2.0.0-alpha.2] 2022-07-07
 
-### Removed
+### Added
+- `stg email format` wraps `git format-patch` and provides a mechanism
+  to generate patch emails and optional cover letter in mbox format.
+- `stg email send` wraps `git send-email` and allows sending patch
+  emails, either from files generated by `stg email format` or by
+  specifying patches directly.
+
+### Changed
+- Bash completions for shell aliases now fallback to filename
+  completions (#191).
+- Help options listings now ensure --color and --help are shown last.
+- Various zsh completion improvments:
+  - Add descriptions for --color values
+  - Complete -O/--diff-opts values (using `git diff-tree --git-completion-helper`)
+  - Comprehend `stg -C <dir>` options
+  - Improved/corrected alias expansion
+  - Improved error messages when completion is attempted outside git
+    repo and/or StGit-initialized branch
+  - Patch name completions now look and feel like output from `stg
+    series`
+  - Complete patch range syntax ('patch0..patchN') for all relevant
+    commands
+  - Completion for `stg squash` no longer allows duplicate patch name
+    arguments
+  - Removed completions for removed `stg mail` command
+  - Completion for `stg sink` no longer offers hidden patches
+  - Completion for `stg rename` comprehends second, new patch name
+    argument
+  - Completion for `stg diff --range` now works
+
+### Fixed
+- Compatibility with git versions prior to 2.35.0 is repaired by
+  avoiding using `git apply --allow-empty` (#192).
+- Fish completions for -O/--diff-opts are repaired
+
+
+## [2.0.0-alpha.1] 2022-06-17
 
 ### Added
 - `stg series` gains the `-i/--commit-id` option to display patches'
@@ -64,6 +100,12 @@
 - `stg spill` replaces `stg refresh --spill`.
 
 ### Changed
+- StGit aliases are now more like Git aliases. Normal aliases refer to
+  StGit subcommands, but aliases prefixed with '!' are shell aliases
+  that may run arbitrary commands. An example normal alias would be
+  `git config stgit.alias.list 'series --description --empty'`. An
+  example shell alias would be `git config stgit.alias.st '!git status
+  --short'`.
 - The `--ack` and `--review` options now optionally take a value. The
   `--ack-by` and `--review-by` options are deprecated.
 - Commands such as `stg goto`, `stg push`, and `stg pop` now require
diff --git a/Cargo.lock b/Cargo.lock
index f8219e2c..d0ec3572 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -507,7 +507,7 @@ dependencies = [
 
 [[package]]
 name = "stgit"
-version = "2.0.0-alpha.1"
+version = "2.0.0-alpha.2"
 dependencies = [
  "anyhow",
  "atty",
diff --git a/Cargo.toml b/Cargo.toml
index 973456bf..95877843 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stgit"
-version = "2.0.0-alpha.1"
+version = "2.0.0-alpha.2"
 edition = "2021"
 authors = [
     "Catalin Marinas <catalin.marinas@gmail.com>",