release version 2.6.12.6.1

5 files changed, 25 insertions, 19 deletions

diff --git a/Documentation/RelNotes/2.6.1.txt b/Documentation/RelNotes/2.6.1.txt
index 42e2243..075f1c0 100644
--- a/Documentation/RelNotes/2.6.1.txt
+++ b/Documentation/RelNotes/2.6.1.txt
@@ -4,22 +4,15 @@ Magit v2.6.1 Release Notes
 Fixes since v2.6.0
 ------------------
 
-* When the commit message buffer contained nothing but a single line
-  that did not end with a newline, then a warning was shown about
-  there being a non-empty second line.
-
-* Stash and wipref were needlessly signed if signing is enabled.
-
-* Visiting a blob did turn on `diff-hl-mode' if the global mode is on.
+* When a submodule is manually removed without staging the removal,
+  then the status buffer could no longer be updated.
 
 * In some cases not all modified submodules were shown in the status
   buffer.
 
-* When a submodule was manually removed, then the status buffer could
-  no longer be updated.
+* Visiting a blob did turn on `diff-hl-mode' if the global mode is on.
 
-* When installing from Melpa `async-bytecomp-package-mode' was no
-  longer activated early enough.
+* Stash and wipref were needlessly signed if signing is enabled.
 
 * The command `git-commit-save-message' did not strip diffs produced
   by `git commit --verbose'.
@@ -27,8 +20,21 @@ Fixes since v2.6.0
 * Diffs produced by `git commit --verbose' were not completely
   highlighted in the commit message buffer.
 
+* When the commit message buffer contains nothing but a single line
+  that does not end with a newline, then a warning was shown about
+  there being a non-empty second line.
+
+* When installing from Melpa, `async-bytecomp-package-mode' was no
+  longer activated early enough.
+
 This release also contains documentation updates, typofixes, fixes for
 minor bugs, and other small improvements.
 
 Authors
 -------
+
+    14  Jonas Bernoulli
+     5  Kyle Meyer
+     1  Fritz Grabo
+     1  Ingo Lohmar
+     1  Noam Postavsky
diff --git a/default.mk b/default.mk
index 9593230..dd2bea6 100644
--- a/default.mk
+++ b/default.mk
@@ -58,14 +58,14 @@ MAGIT_VERSION       = 2.6
 ASYNC_VERSION       = 1.5
 DASH_VERSION        = 2.12.1
 WITH_EDITOR_VERSION = 2.5.0
-GIT_COMMIT_VERSION  = 2.5.0
-MAGIT_POPUP_VERSION = 2.5.0
+GIT_COMMIT_VERSION  = 2.6.0
+MAGIT_POPUP_VERSION = 2.6.0
 
 ASYNC_MELPA_SNAPSHOT       = 20150909.2257
 DASH_MELPA_SNAPSHOT        = 20151021.113
-WITH_EDITOR_MELPA_SNAPSHOT = 20160223.115
-GIT_COMMIT_MELPA_SNAPSHOT  = 20160130.64
-MAGIT_POPUP_MELPA_SNAPSHOT = 20160302.322
+WITH_EDITOR_MELPA_SNAPSHOT = 20160408.201
+GIT_COMMIT_MELPA_SNAPSHOT  = 20160412.130
+MAGIT_POPUP_MELPA_SNAPSHOT = 20160408.156
 
 EMACSBIN ?= emacs
 
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index ed21cd8..80ba138 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 "20160223.115"))
+;; Package-Requires: ((emacs "24.4") (dash "2.12.1") (with-editor "2.5.0"))
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
 
diff --git a/lisp/magit-popup.el b/lisp/magit-popup.el
index 6119f7c..1a7f587 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 6bd3aba..6e8de32 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 "20160223.115") (git-commit "20160130.64") (magit-popup "20160302.322"))
+;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1") (with-editor "2.5.0") (git-commit "2.6.0") (magit-popup "2.6.0"))
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit