diff options
| -rw-r--r-- | Documentation/RelNotes/3.2.0.org | 99 | ||||
| -rw-r--r-- | Documentation/magit-section.org | 4 | ||||
| -rw-r--r-- | Documentation/magit-section.texi | 4 | ||||
| -rw-r--r-- | Documentation/magit.org | 4 | ||||
| -rw-r--r-- | Documentation/magit.texi | 4 | ||||
| -rw-r--r-- | default.mk | 8 | ||||
| -rw-r--r-- | lisp/git-commit.el | 4 | ||||
| -rw-r--r-- | lisp/magit-libgit.el | 2 | ||||
| -rw-r--r-- | lisp/magit-pkg.el | 12 | ||||
| -rw-r--r-- | lisp/magit-section.el | 4 |
10 files changed, 118 insertions, 27 deletions
diff --git a/Documentation/RelNotes/3.2.0.org b/Documentation/RelNotes/3.2.0.org index 01839a0..198c4b7 100644 --- a/Documentation/RelNotes/3.2.0.org +++ b/Documentation/RelNotes/3.2.0.org @@ -1,9 +1,100 @@ -* Magit v3.2.0 Release Notes (unreleased) -** Breaking changes +* It's Magit! A Git Porcelain inside Emacs + +Magit is a text-based Git user interface that puts an unmatched focus +on streamlining workflows. Commands are invoked using short mnemonic +key sequences that take the cursor’s position in the highly actionable +interface into account to provide context-sensitive behavior. + +With Magit you can do nearly everything that you can do when using Git +on the command-line, but at greater speed and while taking advantage +of advanced features that previously seemed too daunting to use on a +daily basis. Many users will find that by using Magit they can become +more effective Git user. + +For more information about Magit, see https://magit.vc. + +* Magit v3.2.0 Release Notes + +Released 1st August 2021 by Jonas Bernoulli. + +I am pleased to announce the release of Magit version 3.2.0, +representing 84 commits by 5 contributors over one month. + +Also see https://emacsair.me/2021/08/01/magit-3.2. + ** Changes since v3.1.0 + +- The default of ~magit-bury-buffer-function~ was changed to + ~magit-mode-quit-window~. #4412 + +- Added new option ~magit-remote-git-executable~ alongside the existing + ~magit-git-executable~. Previously the latter was used for local and + remote ~git~ processes alike, now the former specifies the executable + that is used when Tramp is involved. Using a single variable was + problematic because we had to use an absolute path on Windows for + performance reasons but that path was almost certainly wrong when + using Tramp. #4447 + +- We now use an absolute path for ~magit-git-executable~ on macOS as + well because at least for some macOS users using just the name of + the executable performs horribly. #4447 + +- The section showing openpgp output in the revision buffer is now + collapsible and starts out collapsed for good signatures or when the + certificate is missing. This hopefully makes it more appealing to + enable ~--show-signature~ (and maybe even encourages some authors to + start signing commits). 1e08ac6fd + +- A mode change or rename can now be applied (un-/staged etc.) without + also applying edits to the same file and vice-versa. #4439 + +- Many commands that act on (or default to) the commit at point now + pick that up in a few more places; when the string at point is a + known hash, on a blame chunk, and on a hunk or file inside a log. + d8d3e4813, 40ad7a25c, 402112c6e + +- The default ~magit-pop-revision-stack-format~ now include the + committer date. 1f85297a3 + +- The default ~magit-log-revision-headers-format~ now includes notes. + 33bd79fd45 + +- Added new options ~magit-repolist-sort-key~ + and ~magit-submodule-list-sort-key~. #4409 + +- Added new function ~magit-repolist-column-flags~. 35067f512 + +- Added new option ~magit-ediff-use-indirect-buffers~. #4395 + +- Added new function ~magit-process-git~. fd5cf6173 + +- Added new function ~magit-git-config-p~. 60f82a323 + ** Fixes since v3.1.0 - In the normal case ~magit-name-tag~ failed to return the tag. + 14170b4ea + +- ~magit-completing-read-multiple*~ tried to use a variable that is + unbound if ~helm~ isn't loaded. 29b0cb489 + +- Some push commands couldn't deal with remote and branch names that + contain the percent character. #4428 + +- ~magit-git-shortlog~ got stuck in the repository in which it was first + invoked. 384610edb + +- ~magit-commit-augment~ did not support ~--allow-empty~. bbdfd4287 + +- Squash commands didn't fully take ~--author~ into account. 02d2917c6 + +- ~magit-completing-read-multiple*~ conflicted with the ~consult~ package. + #4437 + +* Authors -- ~magit-completing-read-multiple*~ tried to use variable that is - unbound if ~helm~ isn't loaded. + 73 Jonas Bernoulli + 6 Kyle Meyer + 2 Boruch Baum + 1 Philippe Cavalaria + 1 Toon Claes diff --git a/Documentation/magit-section.org b/Documentation/magit-section.org index 0cc01fa..28fef76 100644 --- a/Documentation/magit-section.org +++ b/Documentation/magit-section.org @@ -8,7 +8,7 @@ #+TEXINFO_DIR_CATEGORY: Emacs #+TEXINFO_DIR_TITLE: Magit-Section: (magit-section). #+TEXINFO_DIR_DESC: Use Magit sections in your own packages. -#+SUBTITLE: for version 3.1.1 +#+SUBTITLE: for version 3.2.0 #+TEXINFO_DEFFN: t #+OPTIONS: H:4 num:3 toc:2 @@ -26,7 +26,7 @@ user options see [[info:magit#Sections]]. This manual documents how you can use sections in your own packages. #+TEXINFO: @noindent -This manual is for Magit-Section version 3.1.1. +This manual is for Magit-Section version 3.2.0. #+BEGIN_QUOTE Copyright (C) 2015-2021 Jonas Bernoulli <jonas@bernoul.li> diff --git a/Documentation/magit-section.texi b/Documentation/magit-section.texi index 84a8977..6695fb0 100644 --- a/Documentation/magit-section.texi +++ b/Documentation/magit-section.texi @@ -31,7 +31,7 @@ General Public License for more details. @finalout @titlepage @title Magit-Section Developer Manual -@subtitle for version 3.1.1 +@subtitle for version 3.2.0 @author Jonas Bernoulli @page @vskip 0pt plus 1filll @@ -54,7 +54,7 @@ user options see @ref{Sections,,,magit,}. This manual documents how you can use sections in your own packages. @noindent -This manual is for Magit-Section version 3.1.1. +This manual is for Magit-Section version 3.2.0. @quotation Copyright (C) 2015-2021 Jonas Bernoulli <jonas@@bernoul.li> diff --git a/Documentation/magit.org b/Documentation/magit.org index ef30e1a..e609071 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 3.1.1 (v3.1.1-55-gda5ac05e0+1) +#+SUBTITLE: for version 3.2.0 #+TEXINFO_DEFFN: t #+OPTIONS: H:4 num:3 toc:2 @@ -25,7 +25,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 3.1.1 (v3.1.1-55-gda5ac05e0+1). +This manual is for Magit version 3.2.0. #+BEGIN_QUOTE Copyright (C) 2015-2021 Jonas Bernoulli <jonas@bernoul.li> diff --git a/Documentation/magit.texi b/Documentation/magit.texi index 8c7f706..594f0d6 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 3.1.1 (v3.1.1-55-gda5ac05e0+1) +@subtitle for version 3.2.0 @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 3.1.1 (v3.1.1-55-gda5ac05e0+1). +This manual is for Magit version 3.2.0. @quotation Copyright (C) 2015-2021 Jonas Bernoulli <jonas@@bernoul.li> @@ -107,18 +107,18 @@ VERSION ?= $(shell \ git describe --tags --abbrev=0 --always | cut -c2-) DASH_VERSION = 2.18.1 -GIT_COMMIT_VERSION = 3.1.0 +GIT_COMMIT_VERSION = 3.2.0 LIBGIT_VERSION = 0 MAGIT_LIBGIT_VERSION = 0 -MAGIT_SECTION_VERSION = 3.1.0 +MAGIT_SECTION_VERSION = 3.2.0 TRANSIENT_VERSION = 0.3.6 WITH_EDITOR_VERSION = 3.0.4 DASH_MELPA_SNAPSHOT = 20210330 -GIT_COMMIT_MELPA_SNAPSHOT = 20210701 +GIT_COMMIT_MELPA_SNAPSHOT = 20210801 LIBGIT_MELPA_SNAPSHOT = 0 MAGIT_LIBGIT_MELPA_SNAPSHOT = 0 -MAGIT_SECTION_MELPA_SNAPSHOT = 20210701 +MAGIT_SECTION_MELPA_SNAPSHOT = 20210801 TRANSIENT_MELPA_SNAPSHOT = 20210701 WITH_EDITOR_MELPA_SNAPSHOT = 20210524 diff --git a/lisp/git-commit.el b/lisp/git-commit.el index 6b63351..002ca8b 100644 --- a/lisp/git-commit.el +++ b/lisp/git-commit.el @@ -13,8 +13,8 @@ ;; Keywords: git tools vc ;; Homepage: https://github.com/magit/magit -;; Package-Requires: ((emacs "25.1") (dash "20210330") (transient "20210701") (with-editor "20210524")) -;; Package-Version: 3.1.0 +;; Package-Requires: ((emacs "25.1") (dash "2.18.1") (transient "0.3.6") (with-editor "3.0.4")) +;; Package-Version: 3.2.0 ;; SPDX-License-Identifier: GPL-3.0-or-later ;; This file is free software; you can redistribute it and/or modify diff --git a/lisp/magit-libgit.el b/lisp/magit-libgit.el index 7aa3ed3..dcb1f59 100644 --- a/lisp/magit-libgit.el +++ b/lisp/magit-libgit.el @@ -10,7 +10,7 @@ ;; Keywords: git tools vc ;; Homepage: https://github.com/magit/magit -;; Package-Requires: ((emacs "26.1") (magit "3.1.1") (libgit "0")) +;; Package-Requires: ((emacs "26.1") (magit "3.2.0") (libgit "0")) ;; Package-Version: 0 ;; SPDX-License-Identifier: GPL-3.0-or-later diff --git a/lisp/magit-pkg.el b/lisp/magit-pkg.el index 1c46644..ca07853 100644 --- a/lisp/magit-pkg.el +++ b/lisp/magit-pkg.el @@ -1,10 +1,10 @@ -(define-package "magit" "3.1.1" +(define-package "magit" "3.2.0" "A Git porcelain inside Emacs." '((emacs "25.1") - (dash "20210330") - (git-commit "20210701") - (magit-section "20210701") - (transient "20210701") - (with-editor "20210524")) + (dash "2.18.1") + (git-commit "3.2.0") + (magit-section "3.2.0") + (transient "0.3.6") + (with-editor "3.0.4")) :homepage "https://magit.vc" :keywords '("git" "tools" "vc")) diff --git a/lisp/magit-section.el b/lisp/magit-section.el index 221a300..4f5f04d 100644 --- a/lisp/magit-section.el +++ b/lisp/magit-section.el @@ -10,8 +10,8 @@ ;; Keywords: tools ;; Homepage: https://github.com/magit/magit -;; Package-Requires: ((emacs "25.1") (dash "20210330")) -;; Package-Version: 3.1.0 +;; Package-Requires: ((emacs "25.1") (dash "2.18.1")) +;; Package-Version: 3.2.0 ;; SPDX-License-Identifier: GPL-3.0-or-later ;; Magit-Section is free software; you can redistribute it and/or modify |
