Commit c3bbc9b9425f3370690cabb11bd35b9040773fdc - magit

+114

-1

Documentation/RelNotes/3.0.0.org less more

0		* Magit v3.0.0 Release Notes (unreleased)
	0	* It's Magit! A Git Porcelain inside Emacs
	1
	2	Magit is a text-based Git user interface that puts an unmatched focus
	3	on streamlining workflows. Commands are invoked using short mnemonic
	4	key sequences that take the cursor’s position in the highly actionable
	5	interface into account to provide context-sensitive behavior.
	6
	7	With Magit you can do nearly everything that you can do when using Git
	8	on the command-line, but at greater speed and while taking advantage
	9	of advanced features that previously seemed too daunting to use on a
	10	daily basis. Many users will find that by using Magit they can become
	11	more effective Git user.
	12
	13	For more information about Magit, see https://magit.vc.
	14
	15	* Magit v3.0.0 Release Notes
	16
	17	Released 25th May 2021 by Jonas Bernoulli.
	18
	19	I am pleased to announce the release of Magit version 3.0.0,
	20	representing 1264 commits by 87 contributors over 2.5 years.
	21
	22	Also see https://emacsair.me/2021/05/25/magit-3.0.
	23
1	24	** Breaking changes
2	25
3	26	- Dropped support for Git v2.0 and v2.1.

585	608
586	609	This release also contains numerous other bug fixes, typo fixes, and
587	610	documentation fixes.
	611
	612	* Authors
	613
	614	1001 Jonas Bernoulli
	615	120 Kyle Meyer
	616	10 Basil L. Contovounesios
	617	9 Noam Postavsky
	618	5 Vladimir Panteleev
	619	4 Damien Cassou
	620	4 Daniel Martín
	621	4 Sam Cedarbaum
	622	4 Štěpán Němec
	623	3 Adam Porter
	624	3 Benjamin Motz
	625	3 Kévin Le Gouguec
	626	2 Alban Gruin
	627	2 Allen Li
	628	2 Bastian Beischer
	629	2 Clément Pit-Claudel
	630	2 Daniel Fleischer
	631	2 Evan Torrie
	632	2 Ingmar Sittl
	633	2 Leo Vivier
	634	2 Martin Polden
	635	2 Naoya Yamashita
	636	2 Phil Sainty
	637	2 Philipp Stephani
	638	2 Radon Rosborough
	639	2 Ryan C. Thompson
	640	2 Szunti
	641	2 Tassilo Horn
	642	2 Thierry Volpiatto
	643	2 Troy Hinckley
	644	2 zilongshanren
	645	1 Adam Kruszewski
	646	1 Adam Spiers
	647	1 Alexander Miller
	648	1 Andrew Eggenberger
	649	1 Andrew Psaltis
	650	1 Andrew Schwartzmeyer
	651	1 Arnau Roig Ninerola
	652	1 Ashlynn Anderson
	653	1 Ben North
	654	1 Brian Leung
	655	1 Dan Davison
	656	1 Danny Zhu
	657	1 David Ellison
	658	1 Dominique Quatravaux
	659	1 Eric
	660	1 Fritz Grabo
	661	1 Gregory Heytings
	662	1 Hussein Ait-Lahcen
	663	1 Ian Milligan
	664	1 Ilya Grigoriev
	665	1 Johann Klähn
	666	1 Johannes Altmanninger
	667	1 Jonas Galvão Xavier
	668	1 Jonathan Arnett
	669	1 Jonathan del Strother
	670	1 Jordan Galby
	671	1 Josh Elsasser
	672	1 Justin Guenther
	673	1 Keshav Kini
	674	1 Kevin Brubeck Unhammer
	675	1 Kevin J. Foley
	676	1 Knut Olav Bøhmer
	677	1 Magnus Malm
	678	1 Mario Rodas
	679	1 Martin Joerg
	680	1 Matthew Kraai
	681	1 Maxim Cournoyer
	682	1 Michael Griffiths
	683	1 Ola x Nilsson
	684	1 Pancho Horrillo
	685	1 Philipp Fehre
	686	1 Pritam Baral
	687	1 Roey Darwish Dror
	688	1 Sean Whitton
	689	1 Simon Pintarelli
	690	1 Steve Purcell
	691	1 Thomas Fini Hansen
	692	1 Topi Miettinen
	693	1 Tsuyoshi Kitamoto
	694	1 Vitaly Ostashov
	695	1 Vladimir Sedach
	696	1 Wojciech Siewierski
	697	1 Yann Herklotz
	698	1 Ynilu
	699	1 Zhu Zihao
	700	1 zakora

+2

-2

Documentation/magit-section.org less more

7	7	#+TEXINFO_DIR_CATEGORY: Emacs
8	8	#+TEXINFO_DIR_TITLE: Magit-Section: (magit-section).
9	9	#+TEXINFO_DIR_DESC: Use Magit sections in your own packages.
10		#+SUBTITLE: for version 2.90.1 (v2.90.1-1138-gd583ea35d+1)
	10	#+SUBTITLE: for version 3.0.0
11	11
12	12	#+TEXINFO_DEFFN: t
13	13	#+OPTIONS: H:4 num:3 toc:2

25	25	can use sections in your own packages.
26	26
27	27	#+TEXINFO: @noindent
28		This manual is for Magit-Section version 2.90.1 (v2.90.1-1138-gd583ea35d+1).
	28	This manual is for Magit-Section version 3.0.0.
29	29
30	30	#+BEGIN_QUOTE
31	31	Copyright (C) 2015-2021 Jonas Bernoulli <jonas@bernoul.li>

+2

-2

Documentation/magit-section.texi less more

30	30	@finalout
31	31	@titlepage
32	32	@title Magit-Section Developer Manual
33		@subtitle for version 2.90.1 (v2.90.1-1138-gd583ea35d+1)
	33	@subtitle for version 3.0.0
34	34	@author Jonas Bernoulli
35	35	@page
36	36	@vskip 0pt plus 1filll

53	53	can use sections in your own packages.
54	54
55	55	@noindent
56		This manual is for Magit-Section version 2.90.1 (v2.90.1-1138-gd583ea35d+1).
	56	This manual is for Magit-Section version 3.0.0.
57	57
58	58	@quotation
59	59	Copyright (C) 2015-2021 Jonas Bernoulli <jonas@@bernoul.li>

+2

-2

Documentation/magit.org less more

7	7	#+TEXINFO_DIR_CATEGORY: Emacs
8	8	#+TEXINFO_DIR_TITLE: Magit: (magit).
9	9	#+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
10		#+SUBTITLE: for version 2.90.1 (v2.90.1-1221-g99291801+1)
	10	#+SUBTITLE: for version 3.0.0
11	11
12	12	#+TEXINFO_DEFFN: t
13	13	#+OPTIONS: H:4 num:3 toc:2

24	24	Magit and Git itself deserve to be called porcelains.
25	25
26	26	#+TEXINFO: @noindent
27		This manual is for Magit version 2.90.1 (v2.90.1-1221-g99291801+1).
	27	This manual is for Magit version 3.0.0.
28	28
29	29	#+BEGIN_QUOTE
30	30	Copyright (C) 2015-2021 Jonas Bernoulli <jonas@bernoul.li>

+2

-2

Documentation/magit.texi less more

30	30	@finalout
31	31	@titlepage
32	32	@title Magit User Manual
33		@subtitle for version 2.90.1 (v2.90.1-1221-g99291801+1)
	33	@subtitle for version 3.0.0
34	34	@author Jonas Bernoulli
35	35	@page
36	36	@vskip 0pt plus 1filll

52	52	Magit and Git itself deserve to be called porcelains.
53	53
54	54	@noindent
55		This manual is for Magit version 2.90.1 (v2.90.1-1221-g99291801+1).
	55	This manual is for Magit version 3.0.0.
56	56
57	57	@quotation
58	58	Copyright (C) 2015-2021 Jonas Bernoulli <jonas@@bernoul.li>

+17

-5

Makefile less more

219	219	`((emacs ,emacs-version) ;`
220	220	(dash ,dash-version)
221	221	(transient ,transient-version)
222		(with-editor ,with-editor-version)))))
	222	(with-editor ,with-editor-version))))
	223	(re-search-forward "^;; Package-Version: ")
	224	(delete-region (point) (line-end-position))
	225	(insert git-commit-version))
	226
223	227	(with-temp-file "lisp/magit-libgit.el"
224	228	(insert-file-contents "lisp/magit-libgit.el")
225	229	(re-search-forward "^;; Package-Requires: ")

227	231	(insert (format "%S"
228	232	`((emacs "$(LIBGIT_EMACS_VERSION)") ;`
229	233	(magit "$(LIBGIT_MAGIT_VERSION)")
230		(libgit ,libgit-version)))))
	234	(libgit ,libgit-version))))
	235	(re-search-forward "^;; Package-Version: ")
	236	(delete-region (point) (line-end-position))
	237	(insert magit-libgit-version))
231	238	(with-temp-file "lisp/magit-section.el"
232	239	(insert-file-contents "lisp/magit-section.el")
233	240	(re-search-forward "^;; Package-Requires: ")
234	241	(delete-region (point) (line-end-position))
235	242	(insert (format "%S"
236	243	`((emacs ,emacs-version) ;`
237		(dash ,dash-version)))))
	244	(dash ,dash-version))))
	245	(re-search-forward "^;; Package-Version: ")
	246	(delete-region (point) (line-end-position))
	247	(insert magit-section-version))
238	248	(with-temp-file "lisp/magit-pkg.el"
239	249	(insert (format
240	250	"(define-package \"magit\" \"$(VERSION)\"\

242	252	'((emacs %S)
243	253	(dash %S)
244	254	(git-commit %S)
245		;; FIXME (magit-section %S)
	255	(magit-section %S)
246	256	(transient %S)
247	257	(with-editor %S))
248	258	:homepage \"https://magit.vc\"

250	260	" emacs-version
251	261	dash-version
252	262	git-commit-version
253		;; magit-section-version
	263	magit-section-version
254	264	transient-version
255	265	with-editor-version))
256	266	(goto-char (point-min))

267	277	(dash-version \"$(DASH_VERSION)\")\
268	278	(git-commit-version \"$(GIT_COMMIT_VERSION)\")\
269	279	(libgit-version \"$(LIBGIT_VERSION)\")\
	280	(magit-libgit-version \"$(MAGIT_LIBGIT_VERSION)\")\
270	281	(magit-section-version \"$(MAGIT_SECTION_VERSION)\")\
271	282	(transient-version \"$(TRANSIENT_VERSION)\")\
272	283	(with-editor-version \"$(WITH_EDITOR_VERSION)\"))\

278	289	(dash-version \"$(DASH_MELPA_SNAPSHOT)\")\
279	290	(git-commit-version \"$(GIT_COMMIT_MELPA_SNAPSHOT)\")\
280	291	(libgit-version \"$(LIBGIT_MELPA_SNAPSHOT)\")\
	292	(magit-libgit-version \"$(MAGIT_LIBGIT_MELPA_SNAPSHOT)\")\
281	293	(magit-section-version \"$(MAGIT_SECTION_MELPA_SNAPSHOT)\")\
282	294	(transient-version \"$(TRANSIENT_MELPA_SNAPSHOT)\")\
283	295	(with-editor-version \"$(WITH_EDITOR_MELPA_SNAPSHOT)\"))\

+16

-14

default.mk less more

105	105	test -e $(TOP).git && \
106	106	git describe --tags --abbrev=0 --always \| cut -c2-)
107	107
108		DASH_VERSION = 2.17.0
109		GIT_COMMIT_VERSION = 3.0.0
110		LIBGIT_VERSION = 0
111		MAGIT_SECTION_VERSION = 3.0.0
112		TRANSIENT_VERSION = 0
113		WITH_EDITOR_VERSION = 2.9.2
114
115		DASH_MELPA_SNAPSHOT = 20200524
116		GIT_COMMIT_MELPA_SNAPSHOT = 20200516
117		LIBGIT_MELPA_SNAPSHOT = 0
118		MAGIT_SECTION_MELPA_SNAPSHOT = 20200605
119		TRANSIENT_MELPA_SNAPSHOT = 20200601
120		WITH_EDITOR_MELPA_SNAPSHOT = 20200522
	108	DASH_VERSION = 2.18.1
	109	GIT_COMMIT_VERSION = $(VERSION)
	110	LIBGIT_VERSION = 0
	111	MAGIT_LIBGIT_VERSION = 0
	112	MAGIT_SECTION_VERSION = $(VERSION)
	113	TRANSIENT_VERSION = 0.3.3
	114	WITH_EDITOR_VERSION = 3.0.4
	115
	116	DASH_MELPA_SNAPSHOT = 20210330
	117	GIT_COMMIT_MELPA_SNAPSHOT = 20210524
	118	LIBGIT_MELPA_SNAPSHOT = 0
	119	MAGIT_LIBGIT_MELPA_SNAPSHOT = 0
	120	MAGIT_SECTION_MELPA_SNAPSHOT = 20210524
	121	TRANSIENT_MELPA_SNAPSHOT = 20210524
	122	WITH_EDITOR_MELPA_SNAPSHOT = 20210524
121	123
122	124	EMACS_VERSION = 25.1
123	125
124	126	LIBGIT_EMACS_VERSION = 26.1
125		LIBGIT_MAGIT_VERSION = 0
	127	LIBGIT_MAGIT_VERSION = $(VERSION)
126	128
127	129	EMACSOLD := $(shell $(BATCH) --eval \
128	130	"(and (version< emacs-version \"$(EMACS_VERSION)\") (princ \"true\"))")

+2

-1

lisp/git-commit.el less more

12	12
13	13	;; Keywords: git tools vc
14	14	;; Homepage: https://github.com/magit/magit
15		;; Package-Requires: ((emacs "25.1") (dash "20200524") (transient "20200601") (with-editor "20200522"))
	15	;; Package-Requires: ((emacs "25.1") (dash "2.18.1") (transient "0.3.3") (with-editor "3.0.4"))
	16	;; Package-Version: 3.0.0
16	17	;; SPDX-License-Identifier: GPL-3.0-or-later
17	18
18	19	;; This file is free software; you can redistribute it and/or modify

+2

-1

lisp/magit-libgit.el less more

9	9	;; Keywords: git tools vc
10	10	;; Homepage: https://github.com/magit/magit
11	11
12		;; Package-Requires: ((emacs "26.1") (magit "0") (libgit "0"))
	12	;; Package-Requires: ((emacs "26.1") (magit "3.0.0") (libgit "0"))
	13	;; Package-Version: 0
13	14	;; SPDX-License-Identifier: GPL-3.0-or-later
14	15
15	16	;; Magit is free software; you can redistribute it and/or modify it

+6

-5

lisp/magit-pkg.el less more

0		(define-package "magit" "2.90.1"
	0	(define-package "magit" "3.0.0"
1	1	"A Git porcelain inside Emacs."
2	2	'((emacs "25.1")
3		(dash "20200524")
4		(git-commit "20200516")
5		(transient "20200601")
6		(with-editor "20200522"))
	3	(dash "2.18.1")
	4	(git-commit "3.0.0")
	5	(magit-section "3.0.0")
	6	(transient "0.3.3")
	7	(with-editor "3.0.4"))
7	8	:homepage "https://magit.vc"
8	9	:keywords '("git" "tools" "vc"))

+2

-1

lisp/magit-section.el less more

9	9
10	10	;; Keywords: tools
11	11	;; Homepage: https://github.com/magit/magit
12		;; Package-Requires: ((emacs "25.1") (dash "20200524"))
	12	;; Package-Requires: ((emacs "25.1") (dash "2.18.1"))
	13	;; Package-Version: 3.0.0
13	14	;; SPDX-License-Identifier: GPL-3.0-or-later
14	15
15	16	;; Magit-Section is free software; you can redistribute it and/or modify