diff options
| -rw-r--r-- | Documentation/RelNotes/2.90.1.org | 39 | ||||
| -rw-r--r-- | Documentation/RelNotes/2.91.0.org | 12 | ||||
| -rw-r--r-- | Documentation/magit.org | 4 | ||||
| -rw-r--r-- | Documentation/magit.texi | 4 | ||||
| l--------- | RelNotes | 1 | ||||
| l--------- | RelNotes.org | 1 | ||||
| -rw-r--r-- | lisp/git-commit.el | 2 | ||||
| -rw-r--r-- | lisp/magit-pkg.el | 14 |
8 files changed, 64 insertions, 13 deletions
diff --git a/Documentation/RelNotes/2.90.1.org b/Documentation/RelNotes/2.90.1.org new file mode 100644 index 0000000..2c601f8 --- /dev/null +++ b/Documentation/RelNotes/2.90.1.org @@ -0,0 +1,39 @@ +* Magit v2.90.1 Release Notes +** Changes since v2.90.0 + +- Added ~bug-reference-mode~ to ~git-commit-setup-hook~. e19e8fb1e + +- The "Version" column in ~magit-submodule-list-mode~ and + ~magit-repolist-mode~ buffers now shows when a repository is dirty. + 0b86dbfd6 + +- Added new command ~magit-log-merged~. This command requires + ~git-when-merged~ (https://github.com/mhagger/git-when-merged). It + isn't bound in ~magit-log-popup~ by default. To add it, you can use + something like + + #+BEGIN_SRC emacs-lisp + (magit-define-popup-action 'magit-log-popup + ?m "Log commit's merge" 'magit-log-merged) + #+END_SRC + + #3657 + +** Fixes since v2.90.0 + +- Bumped the minimal required version of ~git-commit~ to the correct + version. e9bd33758 + +- Dropped the new "v" prefix that we started to add to release tags + starting with the previous release in places where that prefix is + undesirable. f441cf6d7 + +- Staging and unstaging submodules while ~diff.submodule~'s value is ~log~ + broke shortly before the v2.90.0 release. #3654 + +* Authors + + 10 Jonas Bernoulli + 1 Allen Li + 1 Kevin Brubeck Unhammer + 1 Kyle Meyer diff --git a/Documentation/RelNotes/2.91.0.org b/Documentation/RelNotes/2.91.0.org index 3b143d5..ce45589 100644 --- a/Documentation/RelNotes/2.91.0.org +++ b/Documentation/RelNotes/2.91.0.org @@ -2,8 +2,11 @@ ** Breaking changes ** Changes since v2.90.0 +- Added ~bug-reference-mode~ to ~git-commit-setup-hook~. e19e8fb1e + - The "Version" column in ~magit-submodule-list-mode~ and ~magit-repolist-mode~ buffers now shows when a repository is dirty. + 0b86dbfd6 - Added new command ~magit-log-merged~. This command requires ~git-when-merged~ (https://github.com/mhagger/git-when-merged). It @@ -15,7 +18,16 @@ ?m "Log commit's merge" 'magit-log-merged) #+END_SRC + #3657 + ** Fixes since v2.90.0 +- Bumped the minimal required version of ~git-commit~ to the correct + version. e9bd33758 + +- Dropped the new "v" prefix that we started to add to release tags + starting with the previous release in places where that prefix is + undesirable. f441cf6d7 + - Staging and unstaging submodules while ~diff.submodule~'s value is ~log~ broke shortly before the v2.90.0 release. #3654 diff --git a/Documentation/magit.org b/Documentation/magit.org index 955d532..20d0abc 100644 --- a/Documentation/magit.org +++ b/Documentation/magit.org @@ -8,7 +8,7 @@ #+TEXINFO_DIR_CATEGORY: Emacs #+TEXINFO_DIR_TITLE: Magit: (magit). #+TEXINFO_DIR_DESC: Using Git from Emacs with Magit. -#+SUBTITLE: for version 2.90.0 (v2.90.0-4-g13b32ae1c+1) +#+SUBTITLE: for version 2.90.1 #+BIND: ox-texinfo+-before-export-hook ox-texinfo+-update-version-strings #+TEXINFO_DEFFN: t @@ -23,7 +23,7 @@ directly from within Emacs. While many fine Git clients exist, only Magit and Git itself deserve to be called porcelains. #+TEXINFO: @noindent -This manual is for Magit version 2.90.0 (v2.90.0-4-g13b32ae1c+1). +This manual is for Magit version 2.90.1. #+BEGIN_QUOTE Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li> diff --git a/Documentation/magit.texi b/Documentation/magit.texi index e1f66ae..09048c0 100644 --- a/Documentation/magit.texi +++ b/Documentation/magit.texi @@ -31,7 +31,7 @@ General Public License for more details. @finalout @titlepage @title Magit User Manual -@subtitle for version 2.90.0 (v2.90.0-4-g13b32ae1c+1) +@subtitle for version 2.90.1 @author Jonas Bernoulli @page @vskip 0pt plus 1filll @@ -53,7 +53,7 @@ directly from within Emacs. While many fine Git clients exist, only Magit and Git itself deserve to be called porcelains. @noindent -This manual is for Magit version 2.90.0 (v2.90.0-4-g13b32ae1c+1). +This manual is for Magit version 2.90.1. @quotation Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li> diff --git a/RelNotes b/RelNotes deleted file mode 120000 index a070076..0000000 --- a/RelNotes +++ /dev/null @@ -1 +0,0 @@ -Documentation/RelNotes/2.91.0.org
\ No newline at end of file diff --git a/RelNotes.org b/RelNotes.org new file mode 120000 index 0000000..ec4bfe1 --- /dev/null +++ b/RelNotes.org @@ -0,0 +1 @@ +Documentation/RelNotes/2.90.1.org
\ No newline at end of file diff --git a/lisp/git-commit.el b/lisp/git-commit.el index 4e14570..74e88c6 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 "25.1") (dash "20180910") (with-editor "20181103")) +;; Package-Requires: ((emacs "25.1") (dash "2.14.1") (with-editor "2.8.0")) ;; Keywords: git tools vc ;; Homepage: https://github.com/magit/magit diff --git a/lisp/magit-pkg.el b/lisp/magit-pkg.el index f4ac879..915eb28 100644 --- a/lisp/magit-pkg.el +++ b/lisp/magit-pkg.el @@ -1,9 +1,9 @@ -(define-package "magit" "2.90.0" +(define-package "magit" "2.90.1" "A Git porcelain inside Emacs." '((emacs "25.1") - (async "20180527") - (dash "20180910") - (ghub "20181107") - (git-commit "20181104") - (magit-popup "20181003") - (with-editor "20181103"))) + (async "1.9.3") + (dash "2.14.1") + (ghub "3.0.0") + (git-commit "2.90.0") + (magit-popup "2.12.4") + (with-editor "2.8.0"))) |