diff options
| -rw-r--r-- | Documentation/RelNotes/2.6.2.txt | 26 | ||||
| -rw-r--r-- | default.mk | 10 | ||||
| -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, 23 insertions, 19 deletions
diff --git a/Documentation/RelNotes/2.6.2.txt b/Documentation/RelNotes/2.6.2.txt index eba1340..9433128 100644 --- a/Documentation/RelNotes/2.6.2.txt +++ b/Documentation/RelNotes/2.6.2.txt @@ -1,14 +1,13 @@ -Magit v2.6.2 Release Notes (draft) -================================== +Magit v2.6.2 Release Notes +========================== Changes since v2.6.1 -------------------- * Added new section inserter `magit-insert-submodules'. For each - submodule it inserts the module path and the output of `git descibe - --tags'. + submodule it inserts the module path and a description of its tip. -* When adding an already configure but for some reason unstaged +* When re-adding an already configured but for some reason unstaged submodule, then `magit-submodule-add' now offers the configured submodule name as default choice. @@ -20,7 +19,7 @@ Fixes since v2.6.1 and `magit-merge-editmsg' now work around that by always using `--no-ff'. -* The command `magit-log', when called with `--patch' but not +* The command `magit-log', when called with `--patch' but without `--graph', deleted the first two characters of file names in the diff. @@ -28,15 +27,15 @@ Fixes since v2.6.1 because the commit process still held the lock on `index.lock'. * The command `magit-submodule-add' offered an invalid default choice - for the module path and allowed selecting a path to a file that is - not a repository. + for the module path and allowed selecting a file that isn't a + repository. * `git-rebase-mode' failed to prevent `save-place-mode' from having an effect. -* When no upstream is configured, then - `magit-insert-unpulled-from-upstream-or-recent' failed to insert the - recent commits instead. +* The section inserter `magit-insert-unpulled-from-upstream-or-recent' + failed to insert the recent commits instead when no upstream is + configured. * Two key bindings in `magit-pull-and-fetch-popup' conflicted. @@ -46,3 +45,8 @@ Fixes since v2.6.1 Authors ------- + + 21 Jonas Bernoulli + 1 John Mastro + 1 Kyle Meyer + 1 Noam Postavsky @@ -57,15 +57,15 @@ EMACS_VERSION = 24.4 MAGIT_VERSION = 2.6 ASYNC_VERSION = 1.5 DASH_VERSION = 2.12.1 -WITH_EDITOR_VERSION = 2.5.0 -GIT_COMMIT_VERSION = 2.6.0 -MAGIT_POPUP_VERSION = 2.6.0 +WITH_EDITOR_VERSION = 2.5.1 +GIT_COMMIT_VERSION = 2.6.1 +MAGIT_POPUP_VERSION = 2.6.1 ASYNC_MELPA_SNAPSHOT = 20150909.2257 DASH_MELPA_SNAPSHOT = 20151021.113 WITH_EDITOR_MELPA_SNAPSHOT = 20160408.201 -GIT_COMMIT_MELPA_SNAPSHOT = 20160412.130 -MAGIT_POPUP_MELPA_SNAPSHOT = 20160408.156 +GIT_COMMIT_MELPA_SNAPSHOT = 20160414.251 +MAGIT_POPUP_MELPA_SNAPSHOT = 20160414.251 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 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 58340ce..5009795 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 "20160412.130") (magit-popup "20160408.156")) +;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1") (with-editor "2.5.1") (git-commit "2.6.1") (magit-popup "2.6.1")) ;; Keywords: git tools vc ;; Homepage: https://github.com/magit/magit |