diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2017-02-14 12:46:28 +0100 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2017-02-14 12:46:28 +0100 |
| commit | ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d (patch) | |
| tree | 990d0f4f440c492c6211adef233bd75c233631a6 | |
| parent | 1643dc626ab28fd28eff8a94272f0f4fba8e2737 (diff) | |
Release version 2.10.22.10.2
| -rw-r--r-- | Documentation/RelNotes/2.10.2.txt | 18 | ||||
| -rw-r--r-- | default.mk | 12 | ||||
| -rw-r--r-- | lisp/git-commit.el | 2 | ||||
| -rw-r--r-- | lisp/magit-popup.el | 2 | ||||
| -rw-r--r-- | lisp/magit.el | 2 |
5 files changed, 24 insertions, 12 deletions
diff --git a/Documentation/RelNotes/2.10.2.txt b/Documentation/RelNotes/2.10.2.txt index 53f2b30..bcaa040 100644 --- a/Documentation/RelNotes/2.10.2.txt +++ b/Documentation/RelNotes/2.10.2.txt @@ -1,5 +1,5 @@ -Magit v2.10.2 Release Notes (unreleased) -======================================== +Magit v2.10.2 Release Notes +=========================== Changes since v2.10.1 --------------------- @@ -16,7 +16,7 @@ Fixes since v2.10.1 and because of a too-strict assertion that only single-parent commits can be cherry-picked. #2978 -* magit-abbrev-length mishandled two edge cases, returning 0 when +* `magit-abbrev-length' mishandled two edge cases, returning 0 when called within an empty repository or outside of a repository. 077740f5 @@ -33,3 +33,15 @@ Fixes since v2.10.1 visited for deleted and added lines. For example, with the range "rev1..rev2", calling `magit-diff-visit-file' on a deleted line visited the blob for rev2. c24f32cd + +This release also contains other minor improvements, bug fixes, and +documentation fixes. + +Authors +------- + + 10 Jonas Bernoulli + 9 Kyle Meyer + 1 Ben North + 1 Fabian Wiget + 1 Mark Oteiza @@ -96,15 +96,15 @@ VERSION := $(shell \ MAGIT_VERSION = 2.10 ASYNC_VERSION = 1.9 DASH_VERSION = 2.13.0 -WITH_EDITOR_VERSION = 2.5.9 -GIT_COMMIT_VERSION = 2.10.0 -MAGIT_POPUP_VERSION = 2.10.0 +WITH_EDITOR_VERSION = 2.5.10 +GIT_COMMIT_VERSION = 2.10.1 +MAGIT_POPUP_VERSION = 2.10.1 ASYNC_MELPA_SNAPSHOT = 20161103.1036 -DASH_MELPA_SNAPSHOT = 20161121.55 +DASH_MELPA_SNAPSHOT = 20170207.2056 WITH_EDITOR_MELPA_SNAPSHOT = 20170111.609 -GIT_COMMIT_MELPA_SNAPSHOT = 20170112.334 -MAGIT_POPUP_MELPA_SNAPSHOT = 20170104.924 +GIT_COMMIT_MELPA_SNAPSHOT = 20170128.745 +MAGIT_POPUP_MELPA_SNAPSHOT = 20170209.1031 EMACS_VERSION = 24.4 diff --git a/lisp/git-commit.el b/lisp/git-commit.el index a926f16..52a986f 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 "20161121.55") (with-editor "20170111.609")) +;; Package-Requires: ((emacs "24.4") (dash "2.13.0") (with-editor "2.5.10")) ;; Keywords: git tools vc ;; Homepage: https://github.com/magit/magit diff --git a/lisp/magit-popup.el b/lisp/magit-popup.el index b190e0d..c53d0e7 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 "20161103.1036") (dash "20161121.55")) +;; Package-Requires: ((emacs "24.4") (async "1.9") (dash "2.13.0")) ;; Keywords: bindings ;; Homepage: https://github.com/magit/magit diff --git a/lisp/magit.el b/lisp/magit.el index 68a77eb..8d86a0b 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 "20161103.1036") (dash "20161121.55") (with-editor "20170111.609") (git-commit "20170112.334") (magit-popup "20170104.924")) +;; Package-Requires: ((emacs "24.4") (async "1.9") (dash "2.13.0") (with-editor "2.5.10") (git-commit "2.10.1") (magit-popup "2.10.1")) ;; Keywords: git tools vc ;; Homepage: https://github.com/magit/magit |