aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2017-09-13 12:42:03 +0200
committerJonas Bernoulli <jonas@bernoul.li>2017-09-13 12:42:03 +0200
commit4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5 (patch)
tree9f47184aa875c0ac2774230f092142b82247b842
parentbf71241122e1a0bf707913c87493214ceb12f588 (diff)
Release version 2.11.02.11.0
-rw-r--r--Documentation/RelNotes/2.11.0.txt62
-rw-r--r--Documentation/magit-popup.org2
-rw-r--r--Documentation/magit-popup.texi2
-rw-r--r--Documentation/magit.org2
-rw-r--r--Documentation/magit.texi2
-rw-r--r--default.mk22
-rw-r--r--lisp/git-commit.el2
-rw-r--r--lisp/magit-popup.el2
-rw-r--r--lisp/magit.el2
9 files changed, 78 insertions, 20 deletions
diff --git a/Documentation/RelNotes/2.11.0.txt b/Documentation/RelNotes/2.11.0.txt
index 8cdbcb6..1cd9694 100644
--- a/Documentation/RelNotes/2.11.0.txt
+++ b/Documentation/RelNotes/2.11.0.txt
@@ -1,5 +1,33 @@
-Magit v2.11.0 Release Notes (unreleased)
-========================================
+It's Magit! A Git Porcelain inside Emacs
+=========================================
+
+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 https://magit.vc.
+
+Magit needs your help
+=====================
+
+If Magit helps you be more productive, then please consider backing
+the fundraising campaign on Kickstarter. Thanks! <3
+
+https://www.kickstarter.com/projects/1681258897/its-magit-the-magical-git-client?ref=ej621y
+
+Magit v2.11.0 Release Notes
+===========================
+
+Released 13th September 2017 by Jonas Bernoulli.
+
+I am pleased to announce the release of Magit version 2.11.0,
+representing 303 commits by 26 contributors over six months.
+
+Also see https://emacsair.me/2017/09/12/magit-2.11.
Changes since v2.10.3
---------------------
@@ -171,3 +199,33 @@ Fixes since v2.10.3
This release also contains the fixes described in the v2.10.{1,2,3}
release notes, as well as other minor improvements, bug fixes, typo
fixes, and documentation fixes.
+
+Authors
+-------
+
+ 148 Jonas Bernoulli
+ 93 Kyle Meyer
+ 15 Damien Cassou
+ 15 Noam Postavsky
+ 5 Basil L. Contovounesios
+ 3 Justin Guenther
+ 2 Alex Kost
+ 2 Duianto Vebotci
+ 2 Radon Rosborough
+ 2 Štěpán Němec
+ 1 Adam Benanti
+ 1 Allen Li
+ 1 Ben North
+ 1 Erik Anderson
+ 1 Eyal Lotem
+ 1 Fabian Wiget
+ 1 Ioan-Adrian Ratiu
+ 1 Jeremy Meng
+ 1 Justin Burkett
+ 1 Justin Thomas
+ 1 Kévin Le Gouguec
+ 1 Marc Sherry
+ 1 Mark Karpov
+ 1 Mark Oteiza
+ 1 Sean Whitton
+ 1 Yuri Khan
diff --git a/Documentation/magit-popup.org b/Documentation/magit-popup.org
index 4408bb5..7dd7917 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.10
+#+SUBTITLE: for version 2.11
#+TEXINFO_DEFFN: t
#+OPTIONS: H:4 num:4 toc:2
diff --git a/Documentation/magit-popup.texi b/Documentation/magit-popup.texi
index a20ba68..e9795d0 100644
--- a/Documentation/magit-popup.texi
+++ b/Documentation/magit-popup.texi
@@ -30,7 +30,7 @@ General Public License for more details.
@finalout
@titlepage
@title Magit-Popup User Manual
-@subtitle for version 2.10
+@subtitle for version 2.11
@author Jonas Bernoulli
@page
@vskip 0pt plus 1filll
diff --git a/Documentation/magit.org b/Documentation/magit.org
index eae5663..b4b8f72 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.10
+#+SUBTITLE: for version 2.11
#+TEXINFO_DEFFN: t
#+OPTIONS: H:4 num:3 toc:2
diff --git a/Documentation/magit.texi b/Documentation/magit.texi
index 34ef769..17a7deb 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.10
+@subtitle for version 2.11
@author Jonas Bernoulli
@page
@vskip 0pt plus 1filll
diff --git a/default.mk b/default.mk
index b0b0677..74a5790 100644
--- a/default.mk
+++ b/default.mk
@@ -95,18 +95,18 @@ VERSION := $(shell \
(load-file \"magit-version.el\")\
(princ magit-version))")
-MAGIT_VERSION = 2.10
-ASYNC_VERSION = 1.9
+MAGIT_VERSION = 2.11
+ASYNC_VERSION = 1.9.2
DASH_VERSION = 2.13.0
-WITH_EDITOR_VERSION = 2.5.10
-GIT_COMMIT_VERSION = 2.10.2
-MAGIT_POPUP_VERSION = 2.10.2
-
-ASYNC_MELPA_SNAPSHOT = 20170219.942
-DASH_MELPA_SNAPSHOT = 20170207.2056
-WITH_EDITOR_MELPA_SNAPSHOT = 20170111.609
-GIT_COMMIT_MELPA_SNAPSHOT = 20170214.347
-MAGIT_POPUP_MELPA_SNAPSHOT = 20170214.347
+WITH_EDITOR_VERSION = 2.6.0
+GIT_COMMIT_VERSION = 2.10.3
+MAGIT_POPUP_VERSION = 2.10.3
+
+ASYNC_MELPA_SNAPSHOT = 20170823
+DASH_MELPA_SNAPSHOT = 20170810
+WITH_EDITOR_MELPA_SNAPSHOT = 20170817
+GIT_COMMIT_MELPA_SNAPSHOT = 20170823
+MAGIT_POPUP_MELPA_SNAPSHOT = 20170824
EMACS_VERSION = 24.4
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index de3b528..a309e66 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 "20170207.2056") (with-editor "20170111.609"))
+;; Package-Requires: ((emacs "24.4") (dash "2.13.0") (with-editor "2.6.0"))
;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit
diff --git a/lisp/magit-popup.el b/lisp/magit-popup.el
index b126e06..b24937f 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 "20170219.942") (dash "20170207.2056"))
+;; Package-Requires: ((emacs "24.4") (async "1.9.2") (dash "2.13.0"))
;; Keywords: bindings
;; Homepage: https://github.com/magit/magit
diff --git a/lisp/magit.el b/lisp/magit.el
index 4a2895b..6bbcc01 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 "20170219.942") (dash "20170207.2056") (with-editor "20170111.609") (git-commit "20170214.347") (magit-popup "20170214.347"))
+;; Package-Requires: ((emacs "24.4") (async "1.9.2") (dash "2.13.0") (with-editor "2.6.0") (git-commit "2.10.3") (magit-popup "2.10.3"))
;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit