Release version 2.12.12.12.1

7 files changed, 29 insertions, 21 deletions

diff --git a/Documentation/RelNotes/2.12.1.txt b/Documentation/RelNotes/2.12.1.txt
new file mode 100644
index 0000000..a7e0971
--- /dev/null
+++ b/Documentation/RelNotes/2.12.1.txt
@@ -0,0 +1,16 @@
+Magit v2.12.1 Release Notes
+===========================
+
+Fixes since v2.12.0
+-------------------
+
+* Magit 2.12.0 depended on a non-existent Magit-Popup version.
+
+* Key bindings in `magit-remote-popup' conflicted.
+
+Authors
+-------
+
+     8  Jonas Bernoulli
+     1  Dean Kariniemi
+     1  Phil Sainty
diff --git a/Documentation/RelNotes/2.13.0.txt b/Documentation/RelNotes/2.13.0.txt
deleted file mode 100644
index 00427fa..0000000
--- a/Documentation/RelNotes/2.13.0.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Magit v2.13.0 Release Notes (unreleased)
-========================================
-
-Changes since v2.12.0
----------------------
-
-Fixes since v2.12.0
--------------------
diff --git a/Documentation/magit.org b/Documentation/magit.org
index b02c511..1853f63 100644
--- a/Documentation/magit.org
+++ b/Documentation/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 2.12.0
+#+SUBTITLE: for version 2.12.1
 #+BIND: ox-texinfo+-before-export-hook ox-texinfo+-update-version-strings
 
 #+TEXINFO_DEFFN: t
@@ -22,7 +22,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 2.12.0.
+This manual is for Magit version 2.12.1.
 
 #+BEGIN_QUOTE
 Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
diff --git a/Documentation/magit.texi b/Documentation/magit.texi
index 9e8a74d..3e756d0 100644
--- a/Documentation/magit.texi
+++ b/Documentation/magit.texi
@@ -30,7 +30,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Magit User Manual
-@subtitle for version 2.12.0
+@subtitle for version 2.12.1
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -52,7 +52,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 2.12.0.
+This manual is for Magit version 2.12.1.
 
 @quotation
 Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
diff --git a/default.mk b/default.mk
index 4dd6245..5bf3ceb 100644
--- a/default.mk
+++ b/default.mk
@@ -94,9 +94,9 @@ VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0)
 ASYNC_VERSION       = 1.9.2
 DASH_VERSION        = 2.13.0
 GHUB_VERSION        = 2.0.0
-GIT_COMMIT_VERSION  = 2.11.0
+GIT_COMMIT_VERSION  = 2.12.0
 LET_ALIST_VERSION   = 1.0.5
-MAGIT_POPUP_VERSION = 2.13.3
+MAGIT_POPUP_VERSION = 2.12.3
 WITH_EDITOR_VERSION = 2.7.2
 
 ASYNC_MELPA_SNAPSHOT       = 20170823
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 1afec51..072150b 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -11,7 +11,7 @@
 ;;	Marius Vollmer <marius.vollmer@gmail.com>
 ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
 
-;; Package-Requires: ((emacs "24.4") (dash "20170810") (with-editor "20180318"))
+;; Package-Requires: ((emacs "24.4") (dash "2.13.0") (with-editor "2.7.2"))
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
 
diff --git a/lisp/magit-pkg.el b/lisp/magit-pkg.el
index eedb33a..fffef5b 100644
--- a/lisp/magit-pkg.el
+++ b/lisp/magit-pkg.el
@@ -1,10 +1,10 @@
 (define-package "magit" "2.12.0"
   "A Git porcelain inside Emacs."
   '((emacs "24.4")
-    (async "20170823")
-    (dash "20170810")
-    (ghub "20180328")
-    (git-commit "20180329")
+    (async "1.9.2")
+    (dash "2.13.0")
+    (ghub "2.0.0")
+    (git-commit "2.12.0")
     (let-alist "1.0.5")
-    (magit-popup "20180329")
-    (with-editor "20180318")))
+    (magit-popup "2.12.3")
+    (with-editor "2.7.2")))