Skip to content

Commit

Permalink
Release version 2.13.1
Browse files Browse the repository at this point in the history
  • Loading branch information
tarsius committed Nov 8, 2018
1 parent ae9c883 commit 6b7558c
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 15 deletions.
34 changes: 34 additions & 0 deletions Documentation/RelNotes/2.13.1.txt
@@ -0,0 +1,34 @@
Magit v2.13.1 Release Notes
===========================

Fixes since v2.13.0
-------------------

* The prompt used by `magit-rebase-interactive-assert' was wrong.
37d76f409

* `magit-rebase-autosquash' asked for confirmation when the user
already confirmed earlier. 02e6c75b6

* `magit-log-wash-rev` errored in ~magit-cherry-mode~, starting with
Emacs 26.1. 1ee577b35

* Magit used a completion function to make the built-in completion
respect the collection's order. Even though that wasn't necessary
for Ivy and Helm it did the same here, which became a problem when a
change in Helm caused fuzzy completion to break in combination with
a completion function. Likewise a change in Ivy caused Magit's sort
order to be ignored, which we work around now. #3476, #3477

* When using cygwin, then `git-commit-setup-font-lock' could end up
trying to run git in a non-existent directory. #3505

* `magit-insert-modules-unpushed-to-pushremote' failed to insert
anything due to a typo in the used commit range. d4e159f35

Authors
-------

11 Jonas Bernoulli
8 Kyle Meyer
5 Noam Postavsky
3 changes: 0 additions & 3 deletions Documentation/RelNotes/2.90.0.org

This file was deleted.

4 changes: 2 additions & 2 deletions Documentation/magit.org
Expand Up @@ -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.13.0
#+SUBTITLE: for version 2.13.1
#+BIND: ox-texinfo+-before-export-hook ox-texinfo+-update-version-strings

#+TEXINFO_DEFFN: t
Expand All @@ -22,7 +22,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.13.0.
This manual is for Magit version 2.13.1.

#+BEGIN_QUOTE
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
Expand Down
6 changes: 4 additions & 2 deletions Documentation/magit.texi
Expand Up @@ -19,6 +19,7 @@ This document is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE@. See the GNU
General Public License for more details.
@end quotation
@end copying

Expand All @@ -30,7 +31,7 @@ General Public License for more details.
@finalout
@titlepage
@title Magit User Manual
@subtitle for version 2.13.0
@subtitle for version 2.13.1
@author Jonas Bernoulli
@page
@vskip 0pt plus 1filll
Expand All @@ -52,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.13.0.
This manual is for Magit version 2.13.1.

@quotation
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
Expand All @@ -66,6 +67,7 @@ This document is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE@. See the GNU
General Public License for more details.
@end quotation
@end ifnottex

Expand Down
2 changes: 1 addition & 1 deletion lisp/git-commit.el
Expand Up @@ -11,7 +11,7 @@
;; Marius Vollmer <marius.vollmer@gmail.com>
;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>

;; Package-Requires: ((emacs "24.4") (dash "20180413") (with-editor "20180414"))
;; Package-Requires: ((emacs "24.4") (dash "2.14.1") (with-editor "2.7.3"))
;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit

Expand Down
14 changes: 7 additions & 7 deletions lisp/magit-pkg.el
@@ -1,10 +1,10 @@
(define-package "magit" "2.13.0"
(define-package "magit" "2.13.1"
"A Git porcelain inside Emacs."
'((emacs "24.4")
(async "20180527")
(dash "20180413")
(ghub "20180417")
(git-commit "20180602")
(async "1.9.3")
(dash "2.14.1")
(ghub "2.0.1")
(git-commit "2.13.0")
(let-alist "1.0.5")
(magit-popup "20180509")
(with-editor "20180414")))
(magit-popup "2.12.3")
(with-editor "2.7.3")))

0 comments on commit 6b7558c

Please sign in to comment.