aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes/3.2.1.org27
-rw-r--r--Documentation/magit-section.org4
-rw-r--r--Documentation/magit-section.texi4
-rw-r--r--Documentation/magit.org4
-rw-r--r--Documentation/magit.texi4
l---------RelNotes.org2
-rw-r--r--default.mk8
-rw-r--r--lisp/git-commit-pkg.el8
-rw-r--r--lisp/git-commit.el2
-rw-r--r--lisp/magit-libgit-pkg.el4
-rw-r--r--lisp/magit-libgit.el4
-rw-r--r--lisp/magit-pkg.el12
-rw-r--r--lisp/magit-section-pkg.el4
-rw-r--r--lisp/magit-section.el2
-rw-r--r--lisp/magit.el4
15 files changed, 60 insertions, 33 deletions
diff --git a/Documentation/RelNotes/3.2.1.org b/Documentation/RelNotes/3.2.1.org
new file mode 100644
index 0000000..1a80950
--- /dev/null
+++ b/Documentation/RelNotes/3.2.1.org
@@ -0,0 +1,27 @@
+* It's Magit! A Git Porcelain inside Emacs
+
+Magit is a text-based Git user interface that puts an unmatched focus
+on streamlining workflows. Commands are invoked using short mnemonic
+key sequences that take the cursor’s position in the highly actionable
+interface into account to provide context-sensitive behavior.
+
+With Magit you can do nearly everything that you can do when using Git
+on the command-line, but at greater speed and while taking advantage
+of advanced features that previously seemed too daunting to use on a
+daily basis. Many users will find that by using Magit they can become
+more effective Git user.
+
+For more information about Magit, see https://magit.vc.
+
+* Magit v3.2.1 Release Notes
+
+Released 6st August 2021 by Jonas Bernoulli.
+
+I am pleased to announce the release of Magit version 3.2.1.
+
+This is the first release that is available from NonGNU Elpa. It is
+identical to version 3.2.0 except for dependency metadata, which had
+to be changed so that this package could be release on NonGNU Elpa.
+
+Also see https://emacsair.me/2021/08/06/nongnu-elpa
+and https://elpa.nongnu.org/nongnu/magit.html.
diff --git a/Documentation/magit-section.org b/Documentation/magit-section.org
index 28fef76..2fd1bc2 100644
--- a/Documentation/magit-section.org
+++ b/Documentation/magit-section.org
@@ -8,7 +8,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 3.2.0
+#+SUBTITLE: for version 3.2.1
#+TEXINFO_DEFFN: t
#+OPTIONS: H:4 num:3 toc:2
@@ -26,7 +26,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 3.2.0.
+This manual is for Magit-Section version 3.2.1.
#+BEGIN_QUOTE
Copyright (C) 2015-2021 Jonas Bernoulli <jonas@bernoul.li>
diff --git a/Documentation/magit-section.texi b/Documentation/magit-section.texi
index 6695fb0..eb4aaff 100644
--- a/Documentation/magit-section.texi
+++ b/Documentation/magit-section.texi
@@ -31,7 +31,7 @@ General Public License for more details.
@finalout
@titlepage
@title Magit-Section Developer Manual
-@subtitle for version 3.2.0
+@subtitle for version 3.2.1
@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 3.2.0.
+This manual is for Magit-Section version 3.2.1.
@quotation
Copyright (C) 2015-2021 Jonas Bernoulli <jonas@@bernoul.li>
diff --git a/Documentation/magit.org b/Documentation/magit.org
index e609071..ae5ad97 100644
--- a/Documentation/magit.org
+++ b/Documentation/magit.org
@@ -8,7 +8,7 @@
#+TEXINFO_DIR_CATEGORY: Emacs
#+TEXINFO_DIR_TITLE: Magit: (magit).
#+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
-#+SUBTITLE: for version 3.2.0
+#+SUBTITLE: for version 3.2.1
#+TEXINFO_DEFFN: t
#+OPTIONS: H:4 num:3 toc:2
@@ -25,7 +25,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 3.2.0.
+This manual is for Magit version 3.2.1.
#+BEGIN_QUOTE
Copyright (C) 2015-2021 Jonas Bernoulli <jonas@bernoul.li>
diff --git a/Documentation/magit.texi b/Documentation/magit.texi
index 594f0d6..699913a 100644
--- a/Documentation/magit.texi
+++ b/Documentation/magit.texi
@@ -31,7 +31,7 @@ General Public License for more details.
@finalout
@titlepage
@title Magit User Manual
-@subtitle for version 3.2.0
+@subtitle for version 3.2.1
@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 3.2.0.
+This manual is for Magit version 3.2.1.
@quotation
Copyright (C) 2015-2021 Jonas Bernoulli <jonas@@bernoul.li>
diff --git a/RelNotes.org b/RelNotes.org
index b08ef8b..1944c05 120000
--- a/RelNotes.org
+++ b/RelNotes.org
@@ -1 +1 @@
-Documentation/RelNotes/3.3.0.org \ No newline at end of file
+Documentation/RelNotes/3.2.1.org \ No newline at end of file
diff --git a/default.mk b/default.mk
index b3bb4c8..4f94aaa 100644
--- a/default.mk
+++ b/default.mk
@@ -116,11 +116,11 @@ TRANSIENT_VERSION = 0.3.6
WITH_EDITOR_VERSION = 3.0.4
DASH_MELPA_SNAPSHOT = 20210330
-GIT_COMMIT_MELPA_SNAPSHOT = 20210801
+GIT_COMMIT_MELPA_SNAPSHOT = 20210806
LIBGIT_MELPA_SNAPSHOT = 0
-MAGIT_MELPA_SNAPSHOT = 20210801
-MAGIT_LIBGIT_MELPA_SNAPSHOT = 20210801
-MAGIT_SECTION_MELPA_SNAPSHOT = 20210801
+MAGIT_MELPA_SNAPSHOT = 20210806
+MAGIT_LIBGIT_MELPA_SNAPSHOT = 20210806
+MAGIT_SECTION_MELPA_SNAPSHOT = 20210806
TRANSIENT_MELPA_SNAPSHOT = 20210701
WITH_EDITOR_MELPA_SNAPSHOT = 20210524
diff --git a/lisp/git-commit-pkg.el b/lisp/git-commit-pkg.el
index 3b88a1d..105d602 100644
--- a/lisp/git-commit-pkg.el
+++ b/lisp/git-commit-pkg.el
@@ -1,8 +1,8 @@
-(define-package "git-commit" "3.2.0"
+(define-package "git-commit" "3.2.1"
"Edit Git commit messages."
'((emacs "25.1")
- (dash "20210330")
- (transient "20210701")
- (with-editor "20210524"))
+ (dash "2.18.1")
+ (transient "0.3.6")
+ (with-editor "3.0.4"))
:homepage "https://magit.vc"
:keywords '("git" "tools" "vc"))
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 002ca8b..6064ce8 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -14,7 +14,7 @@
;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit
;; Package-Requires: ((emacs "25.1") (dash "2.18.1") (transient "0.3.6") (with-editor "3.0.4"))
-;; Package-Version: 3.2.0
+;; Package-Version: 3.2.1
;; SPDX-License-Identifier: GPL-3.0-or-later
;; This file is free software; you can redistribute it and/or modify
diff --git a/lisp/magit-libgit-pkg.el b/lisp/magit-libgit-pkg.el
index a163b9a..d7f5279 100644
--- a/lisp/magit-libgit-pkg.el
+++ b/lisp/magit-libgit-pkg.el
@@ -1,7 +1,7 @@
-(define-package "magit-libgit" "3.2.0"
+(define-package "magit-libgit" "3.2.1"
"."
'((emacs "25.1")
(libgit "0")
- (magit "20210801"))
+ (magit "3.2.1"))
:homepage "https://magit.vc"
:keywords '("git" "tools" "vc"))
diff --git a/lisp/magit-libgit.el b/lisp/magit-libgit.el
index 566aa29..bdd2025 100644
--- a/lisp/magit-libgit.el
+++ b/lisp/magit-libgit.el
@@ -10,8 +10,8 @@
;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit
-;; Package-Requires: ((emacs "26.1") (libgit "0") (magit "3.2.0"))
-;; Package-Version: 3.2.0
+;; Package-Requires: ((emacs "26.1") (libgit "0") (magit "3.2.1"))
+;; Package-Version: 3.2.1
;; SPDX-License-Identifier: GPL-3.0-or-later
;; Magit is free software; you can redistribute it and/or modify it
diff --git a/lisp/magit-pkg.el b/lisp/magit-pkg.el
index 4438823..9efc8d6 100644
--- a/lisp/magit-pkg.el
+++ b/lisp/magit-pkg.el
@@ -1,10 +1,10 @@
-(define-package "magit" "3.2.0"
+(define-package "magit" "3.2.1"
"A Git porcelain inside Emacs."
'((emacs "25.1")
- (dash "20210330")
- (git-commit "20210801")
- (magit-section "20210801")
- (transient "20210701")
- (with-editor "20210524"))
+ (dash "2.18.1")
+ (git-commit "3.2.1")
+ (magit-section "3.2.1")
+ (transient "0.3.6")
+ (with-editor "3.0.4"))
:homepage "https://magit.vc"
:keywords '("git" "tools" "vc"))
diff --git a/lisp/magit-section-pkg.el b/lisp/magit-section-pkg.el
index 4f6de43..d72c593 100644
--- a/lisp/magit-section-pkg.el
+++ b/lisp/magit-section-pkg.el
@@ -1,6 +1,6 @@
-(define-package "magit-section" "3.2.0"
+(define-package "magit-section" "3.2.1"
"Sections for read-only buffers"
'((emacs "25.1")
- (dash "20210330"))
+ (dash "2.18.1"))
:homepage "https://magit.vc"
:keywords '("tools"))
diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 4f5f04d..66da1e5 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -11,7 +11,7 @@
;; Keywords: tools
;; Homepage: https://github.com/magit/magit
;; Package-Requires: ((emacs "25.1") (dash "2.18.1"))
-;; Package-Version: 3.2.0
+;; Package-Version: 3.2.1
;; SPDX-License-Identifier: GPL-3.0-or-later
;; Magit-Section is free software; you can redistribute it and/or modify
diff --git a/lisp/magit.el b/lisp/magit.el
index 8419601..70b95ea 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -19,8 +19,8 @@
;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit
-;; Package-Requires: ((emacs "25.1") (dash "2.18.1") (git-commit "3.2.0") (magit-section "3.2.0") (transient "0.3.6") (with-editor "3.0.4"))
-;; Package-Version: 3.2.0
+;; Package-Requires: ((emacs "25.1") (dash "2.18.1") (git-commit "3.2.1") (magit-section "3.2.1") (transient "0.3.6") (with-editor "3.0.4"))
+;; Package-Version: 3.2.1
;; SPDX-License-Identifier: GPL-3.0-or-later
;; Magit is free software; you can redistribute it and/or modify it