release version 2.7.02.7.0

9 files changed, 47 insertions, 18 deletions

diff --git a/Documentation/RelNotes/2.7.0.txt b/Documentation/RelNotes/2.7.0.txt
index 7e633b2..683e4e7 100644
--- a/Documentation/RelNotes/2.7.0.txt
+++ b/Documentation/RelNotes/2.7.0.txt
@@ -1,7 +1,27 @@
-Magit v2.7.0 Release Notes (draft)
-==================================
+It's Magit!  A Git Porcelain inside Emacs
+=========================================
 
-Changes since v2.6.2
+Magit is an interface to the version control system Git, implemented
+as an Emacs package.  Magit aspires to be a complete Git porcelain.
+While we cannot (yet) claim that Magit wraps and improves upon each
+and every Git command, it is complete enough to allow even experienced
+Git users to perform almost all of their daily version control tasks
+directly from within Emacs.  While many fine Git clients exist, only
+Magit and Git itself deserve to be called porcelains.
+
+For more information about Magit, see http://magit.vc.
+
+Magit v2.7.0 Release Notes
+==========================
+
+Released 19 May 2016 by Jonas Bernoulli.
+
+We are pleased to announce the release of Magit version 2.7.0,
+representing 116 commits by 7 people over 7 weeks.
+
+Also see http://emacsair.me/2016/05/19/magit-2.7.
+
+Changes since v2.6.0
 --------------------
 
 * Added new popup `magit-subtree-popup' and bound "O" to it.
@@ -52,14 +72,23 @@ Changes since v2.6.2
   hunks are applied and that conflicting hunks are put into reject
   files.
 
-* The command `magit-rebase--continue' learned to reuse the old commit
+* The command `magit-rebase-continue' learned to reuse the old commit
   message as-is when called with a prefix argument.
 
 * In the refs buffer symbolic refs, such as "remotes/origin/HEAD", are
   no longer omitted from the lists of local and remote branches.
 
-Fixes since v2.6.2
-------------------
+This release also contains the fixes described in the v2.6.1 and
+v2.6.2 release notes, as well as various other documentation fixes,
+code clean-ups, bug fixes, and other small to medium improvements.
 
 Authors
 -------
+
+    95  Jonas Bernoulli
+    10  Kyle Meyer
+     7  Noam Postavsky
+     1  Bart Bakker
+     1  Fritz Grabo
+     1  Ingo Lohmar
+     1  John Mastro
diff --git a/Documentation/magit-popup.org b/Documentation/magit-popup.org
index 7b1102e..408654a 100644
--- a/Documentation/magit-popup.org
+++ b/Documentation/magit-popup.org
@@ -7,7 +7,7 @@
 #+TEXINFO_DIR_CATEGORY: Emacs
 #+TEXINFO_DIR_TITLE: Magit-Popup: (magit-popup).
 #+TEXINFO_DIR_DESC: Infix arguments with feedback
-#+SUBTITLE: for version 2.6
+#+SUBTITLE: for version 2.7
 
 #+OPTIONS: H:4 num:3 toc:2
 
diff --git a/Documentation/magit-popup.texi b/Documentation/magit-popup.texi
index 6a52e49..057cd03 100644
--- a/Documentation/magit-popup.texi
+++ b/Documentation/magit-popup.texi
@@ -37,7 +37,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Magit-Popup User Manual
-@subtitle for version 2.6
+@subtitle for version 2.7
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
diff --git a/Documentation/magit.org b/Documentation/magit.org
index d3c1220..06dc359 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.6
+#+SUBTITLE: for version 2.7
 
 #+OPTIONS: H:4 num:3 toc:2
 
diff --git a/Documentation/magit.texi b/Documentation/magit.texi
index d37b62c..3021745 100644
--- a/Documentation/magit.texi
+++ b/Documentation/magit.texi
@@ -40,7 +40,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Magit User Manual
-@subtitle for version 2.6
+@subtitle for version 2.7
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
diff --git a/default.mk b/default.mk
index cc3bc93..4fd8668 100644
--- a/default.mk
+++ b/default.mk
@@ -55,18 +55,18 @@ ELGS = magit-autoloads.el magit-version.el
 
 EMACS_VERSION = 24.4
 
-MAGIT_VERSION       = 2.6
+MAGIT_VERSION       = 2.7
 ASYNC_VERSION       = 1.5
 DASH_VERSION        = 2.12.1
 WITH_EDITOR_VERSION = 2.5.1
-GIT_COMMIT_VERSION  = 2.6.1
-MAGIT_POPUP_VERSION = 2.6.1
+GIT_COMMIT_VERSION  = 2.6.2
+MAGIT_POPUP_VERSION = 2.6.2
 
 ASYNC_MELPA_SNAPSHOT       = 20150909.2257
 DASH_MELPA_SNAPSHOT        = 20151021.113
 WITH_EDITOR_MELPA_SNAPSHOT = 20160408.201
-GIT_COMMIT_MELPA_SNAPSHOT  = 20160414.251
-MAGIT_POPUP_MELPA_SNAPSHOT = 20160414.251
+GIT_COMMIT_MELPA_SNAPSHOT  = 20160425.430
+MAGIT_POPUP_MELPA_SNAPSHOT = 20160512.328
 
 EMACSBIN ?= emacs
 
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index d3dd3df..af28c5b 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 "20160408.201"))
+;; Package-Requires: ((emacs "24.4") (dash "2.12.1") (with-editor "2.5.1"))
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
 
diff --git a/lisp/magit-popup.el b/lisp/magit-popup.el
index 3da4326..953e511 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 8557299..6d579f3 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 "20160408.201") (git-commit "20160414.251") (magit-popup "20160414.251"))
+;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1") (with-editor "2.5.1") (git-commit "2.6.2") (magit-popup "2.6.2"))
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit