aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2015-11-11 13:16:04 +0100
committerJonas Bernoulli <jonas@bernoul.li>2015-11-11 13:16:04 +0100
commit16a7a12c44d63e78e9b223fca7c1c23a144d3ef1 (patch)
treed54cd3e66df1b6c0f92a980a0cce42b0f9e942bd
parent5e2a53a99c8135e9f9c6b0d7deaa5f2e4df5e154 (diff)
release version 2.3.12.3.1
-rw-r--r--Documentation/RelNotes/2.3.1.txt31
-rw-r--r--lisp/git-commit.el2
-rw-r--r--lisp/magit-popup.el2
-rw-r--r--lisp/magit.el2
-rw-r--r--lisp/with-editor.el2
5 files changed, 35 insertions, 4 deletions
diff --git a/Documentation/RelNotes/2.3.1.txt b/Documentation/RelNotes/2.3.1.txt
new file mode 100644
index 0000000..b1d1291
--- /dev/null
+++ b/Documentation/RelNotes/2.3.1.txt
@@ -0,0 +1,31 @@
+Magit v2.3.1 Release Notes
+==========================
+
+Released 11 November 2015 by Jonas Bernoulli.
+
+This is a bugfix release.
+
+* `magit-stash-drop' now shows a message with the hash of the dropped
+ stash to make it easier to recover from dropping the wrong stash.
+
+* `magit-revert-buffers' now avoids needlessly connecting to unrelated
+ hosts. It first checks whether a given file is on the same host as
+ the repository, and only if that is so it checks whether the file is
+ located inside the repository, using `file-in-directory-p', which,
+ for Tramp files, requires connecting to the remote host.
+
+* `magit-commit-message-buffer' no longer hangs when a symlink to the
+ repository is involved.
+
+This release also contains various documentation fixes and code
+clean-ups.
+
+Authors
+-------
+
+ 10 Jonas Bernoulli
+ 3 Noam Postavsky
+ 2 Kyle Meyer
+ 1 Carl Lieberman
+ 1 David L. Rager
+ 1 Syohei Yoshida
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 04246fd..a0cf0a0 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 "20151021.113") (with-editor "20151028"))
+;; Package-Requires: ((emacs "24.4") (dash "2.12.1") (with-editor "2.3.1"))
;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit
diff --git a/lisp/magit-popup.el b/lisp/magit-popup.el
index e6efbfb..e22c3be 100644
--- a/lisp/magit-popup.el
+++ b/lisp/magit-popup.el
@@ -12,7 +12,7 @@
;; Author: Jonas Bernoulli <jonas@bernoul.li>
;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
-;; Package-Requires: ((emacs "24.4") (async "20150909.2257") (dash "20151021.113"))
+;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1"))
;; Keywords: bindings
;; Homepage: https://github.com/magit/magit
diff --git a/lisp/magit.el b/lisp/magit.el
index 87c54b0..32ae48d 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -16,7 +16,7 @@
;; Rémi Vanicat <vanicat@debian.org>
;; Yann Hodique <yann.hodique@gmail.com>
-;; Package-Requires: ((emacs "24.4") (async "20150909.2257") (dash "20151021.113") (with-editor "20151028") (git-commit "20151028") (magit-popup "20151028"))
+;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1") (with-editor "2.3.1") (git-commit "2.3.1") (magit-popup "2.3.1"))
;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit
diff --git a/lisp/with-editor.el b/lisp/with-editor.el
index 3f4e2d3..d0b5d17 100644
--- a/lisp/with-editor.el
+++ b/lisp/with-editor.el
@@ -8,7 +8,7 @@
;; Author: Jonas Bernoulli <jonas@bernoul.li>
;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
-;; Package-Requires: ((emacs "24.4") (async "20150909.2257") (dash "20151021.113"))
+;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1"))
;; Keywords: tools
;; Homepage: https://github.com/magit/magit