branch: elpa/magit
commit 2f1ff91f128f28aa277e0e060ef44b4be8a989c1
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Release version 4.3.6
---
CHANGELOG | 15 +++++++++++++--
docs/magit-section.org | 4 ++--
docs/magit-section.texi | 4 ++--
docs/magit.org | 4 ++--
docs/magit.texi | 4 ++--
lisp/magit-section.el | 6 +++---
lisp/magit.el | 12 ++++++------
7 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 07ff7ff97a0..ba809114037 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,21 +1,32 @@
# -*- mode: org -*-
-* v4.3.6 UNRELEASED
+* v4.3.6 2025-06-01
- Generalized and heavily refactored the code, previously used only to
highlight diff-related sections and to paint hunks, so that it can
be used for other sections as well. The new implementation should
also be a bit faster. cfe4faaaf6^..c556fee1bd
-- A single-section selection how requires a non-empty region.
+- A single-section selection now requires a non-empty region.
6c4c16942a
- When creating a stash, "On <branch>: " is now offered as a second
future history element. 75c6191999, 9b81df36b4
+- Added new commands ~git-rebase-drop~, ~git-rebase-alter~ and
+ ~git-rebase-squish~. 479c467080, 9674c4755a
+
Bugfixes:
- Fixed issues concerning date handling in log margins. #5373
+- The list of rebase actions in the status buffer could contain
+ invalid elements derived from comments in Git's list of such
+ actions. 91806dc729
+
+- Applying the region used to fail, if some part of the same hunk but
+ outside the region has conflicts, even if the part in the region did
+ not. 9e551d9eb7
+
* v4.3.5 2025-05-14
Bugfixes:
diff --git a/docs/magit-section.org b/docs/magit-section.org
index af7fb5ecf71..e479aa1890d 100644
--- a/docs/magit-section.org
+++ b/docs/magit-section.org
@@ -7,7 +7,7 @@
#+texinfo_dir_category: Emacs
#+texinfo_dir_title: Magit-Section: (magit-section).
#+texinfo_dir_desc: Use Magit sections in your own packages.
-#+subtitle: for version 4.3.5
+#+subtitle: for version 4.3.6
#+setupfile: .orgconfig
@@ -21,7 +21,7 @@ user options see [[info:magit#Sections]]. This manual
documents how you
can use sections in your own packages.
#+texinfo: @noindent
-This manual is for Magit-Section version 4.3.5.
+This manual is for Magit-Section version 4.3.6.
#+texinfo: @insertcopying
:END:
diff --git a/docs/magit-section.texi b/docs/magit-section.texi
index fa8d887988b..f8575a11c24 100644
--- a/docs/magit-section.texi
+++ b/docs/magit-section.texi
@@ -31,7 +31,7 @@ General Public License for more details.
@finalout
@titlepage
@title Magit-Section Developer Manual
-@subtitle for version 4.3.5
+@subtitle for version 4.3.6
@author Jonas Bernoulli
@page
@vskip 0pt plus 1filll
@@ -54,7 +54,7 @@ user options see @ref{Sections,,,magit,}. This manual
documents how you
can use sections in your own packages.
@noindent
-This manual is for Magit-Section version 4.3.5.
+This manual is for Magit-Section version 4.3.6.
@insertcopying
@end ifnottex
diff --git a/docs/magit.org b/docs/magit.org
index db98ffa5f08..bcf81777db3 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -7,7 +7,7 @@
#+texinfo_dir_category: Emacs
#+texinfo_dir_title: Magit: (magit).
#+texinfo_dir_desc: Using Git from Emacs with Magit.
-#+subtitle: for version 4.3.5
+#+subtitle: for version 4.3.6
#+setupfile: .orgconfig
@@ -24,7 +24,7 @@ directly from within Emacs. While many fine Git clients
exist, only
Magit and Git itself deserve to be called porcelains.
#+texinfo: @noindent
-This manual is for Magit version 4.3.5.
+This manual is for Magit version 4.3.6.
#+texinfo: @insertcopying
:END:
diff --git a/docs/magit.texi b/docs/magit.texi
index 590c031bc64..112bb136bee 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -31,7 +31,7 @@ General Public License for more details.
@finalout
@titlepage
@title Magit User Manual
-@subtitle for version 4.3.5
+@subtitle for version 4.3.6
@author Jonas Bernoulli
@page
@vskip 0pt plus 1filll
@@ -53,7 +53,7 @@ directly from within Emacs. While many fine Git clients
exist, only
Magit and Git itself deserve to be called porcelains.
@noindent
-This manual is for Magit version 4.3.5.
+This manual is for Magit version 4.3.6.
@insertcopying
@end ifnottex
diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 68fb1640edb..c6b6c971876 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -8,11 +8,11 @@
;; Homepage: https://github.com/magit/magit
;; Keywords: tools
-;; Package-Version: 4.3.5
+;; Package-Version: 4.3.6
;; Package-Requires: (
;; (emacs "27.1")
-;; (compat "30.0.2.0")
-;; (llama "0.6.1")
+;; (compat "30.1")
+;; (llama "0.6.3")
;; (seq "2.24"))
;; SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/lisp/magit.el b/lisp/magit.el
index 97d0493e481..cf37b60ae11 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -17,15 +17,15 @@
;; Homepage: https://github.com/magit/magit
;; Keywords: git tools vc
-;; Package-Version: 4.3.5
+;; Package-Version: 4.3.6
;; Package-Requires: (
;; (emacs "27.1")
-;; (compat "30.1.0.0")
-;; (llama "0.6.2")
-;; (magit-section "4.3.5")
+;; (compat "30.1")
+;; (llama "0.6.3")
+;; (magit-section "4.3.6")
;; (seq "2.24")
-;; (transient "0.8.8")
-;; (with-editor "3.4.3"))
+;; (transient "0.9.0")
+;; (with-editor "3.4.4"))
;; SPDX-License-Identifier: GPL-3.0-or-later
