From 32fde9cef8dddb5cebe44f27a46da4f5081f2909 Mon Sep 17 00:00:00 2001
From: altsem <alltidsemester@pm.me>
Date: Thu, 24 Oct 2024 19:42:50 +0200
Subject: [PATCH] chore(release): prepare for v0.26.0

---
 .recent-changelog-entry | 15 +++++++++++++--
 CHANGELOG.md            | 17 +++++++++++++++++
 Cargo.lock              |  2 +-
 Cargo.toml              |  2 +-
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/.recent-changelog-entry b/.recent-changelog-entry
index 34b2b4e8bd..1d5c0a3a35 100644
--- a/.recent-changelog-entry
+++ b/.recent-changelog-entry
@@ -1,6 +1,17 @@
-## [0.25.0] - 2024-09-03
+## [0.26.0] - 2024-10-24
 
 ### 🚀 Features
 
-- Change priority order of editor envvar lookup
+- Support "The Two Remotes": https://magit.vc/manual/3.2.0/magit/The-Two-Remotes.html
+
+### 🔧 Configuration
+
+- Bind 'Pu' to new action: `push_to_upstream`
+- Bind 'Pp' to new action: `push_to_push_remote`
+- Bind 'Fu' to new action: `pull_from_upstream`
+- Bind 'Fp' to new action: `pull_from_push_remote`
+- Remove 'Pp' <-> `git push` (depended on `push.default`)
+- Remove 'Fp' <-> `git pull` (from upstream)
+- Rename `push_elsewhere` to `push_to_elsewhere`
+- Rename `pull_elsewhere` to `pull_from_elsewhere`
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14a822d645..cf0489b8dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.26.0] - 2024-10-24
+
+### 🚀 Features
+
+- Support "The Two Remotes": https://magit.vc/manual/3.2.0/magit/The-Two-Remotes.html
+
+### 🔧 Configuration
+
+- Bind 'Pu' to new action: `push_to_upstream`
+- Bind 'Pp' to new action: `push_to_push_remote`
+- Bind 'Fu' to new action: `pull_from_upstream`
+- Bind 'Fp' to new action: `pull_from_push_remote`
+- Remove 'Pp' <-> `git push` (depended on `push.default`)
+- Remove 'Fp' <-> `git pull` (from upstream)
+- Rename `push_elsewhere` to `push_to_elsewhere`
+- Rename `pull_elsewhere` to `pull_from_elsewhere`
+
 ## [0.25.0] - 2024-09-03
 
 ### 🚀 Features
diff --git a/Cargo.lock b/Cargo.lock
index 30f34f690e..dfead32c97 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -666,7 +666,7 @@ dependencies = [
 
 [[package]]
 name = "gitu"
-version = "0.25.0"
+version = "0.26.0"
 dependencies = [
  "arboard",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 2b6d3424d7..976f7d7ec7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "gitu"
 description = "A git client inspired by Magit"
-version = "0.25.0"
+version = "0.26.0"
 edition = "2021"
 license = "MIT"