Commit bfc6f6d88619221506e246390e5fbb39087564ec - magit

+35

-6

Documentation/RelNotes/2.7.0.txt less more

0		Magit v2.7.0 Release Notes (draft)
1		==================================
	0	It's Magit! A Git Porcelain inside Emacs
	1	=========================================
2	2
3		Changes since v2.6.2
	3	Magit is an interface to the version control system Git, implemented
	4	as an Emacs package. Magit aspires to be a complete Git porcelain.
	5	While we cannot (yet) claim that Magit wraps and improves upon each
	6	and every Git command, it is complete enough to allow even experienced
	7	Git users to perform almost all of their daily version control tasks
	8	directly from within Emacs. While many fine Git clients exist, only
	9	Magit and Git itself deserve to be called porcelains.
	10
	11	For more information about Magit, see http://magit.vc.
	12
	13	Magit v2.7.0 Release Notes
	14	==========================
	15
	16	Released 19 May 2016 by Jonas Bernoulli.
	17
	18	We are pleased to announce the release of Magit version 2.7.0,
	19	representing 116 commits by 7 people over 7 weeks.
	20
	21	Also see http://emacsair.me/2016/05/19/magit-2.7.
	22
	23	Changes since v2.6.0
4	24	--------------------
5	25
6	26	* Added new popup `magit-subtree-popup' and bound "O" to it.

51	71	hunks are applied and that conflicting hunks are put into reject
52	72	files.
53	73
54		* The command `magit-rebase--continue' learned to reuse the old commit
	74	* The command `magit-rebase-continue' learned to reuse the old commit
55	75	message as-is when called with a prefix argument.
56	76
57	77	* In the refs buffer symbolic refs, such as "remotes/origin/HEAD", are
58	78	no longer omitted from the lists of local and remote branches.
59	79
60		Fixes since v2.6.2
61		------------------
	80	This release also contains the fixes described in the v2.6.1 and
	81	v2.6.2 release notes, as well as various other documentation fixes,
	82	code clean-ups, bug fixes, and other small to medium improvements.
62	83
63	84	Authors
64	85	-------
	86
	87	95 Jonas Bernoulli
	88	10 Kyle Meyer
	89	7 Noam Postavsky
	90	1 Bart Bakker
	91	1 Fritz Grabo
	92	1 Ingo Lohmar
	93	1 John Mastro

+1

-1

Documentation/magit-popup.org less more

6	6	#+TEXINFO_DIR_CATEGORY: Emacs
7	7	#+TEXINFO_DIR_TITLE: Magit-Popup: (magit-popup).
8	8	#+TEXINFO_DIR_DESC: Infix arguments with feedback
9		#+SUBTITLE: for version 2.6
	9	#+SUBTITLE: for version 2.7
10	10
11	11	#+OPTIONS: H:4 num:3 toc:2
12	12

+1

-1

Documentation/magit-popup.texi less more

36	36	@finalout
37	37	@titlepage
38	38	@title Magit-Popup User Manual
39		@subtitle for version 2.6
	39	@subtitle for version 2.7
40	40	@author Jonas Bernoulli
41	41	@page
42	42	@vskip 0pt plus 1filll

+1

-1

Documentation/magit.org less more

6	6	#+TEXINFO_DIR_CATEGORY: Emacs
7	7	#+TEXINFO_DIR_TITLE: Magit: (magit).
8	8	#+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
9		#+SUBTITLE: for version 2.6
	9	#+SUBTITLE: for version 2.7
10	10
11	11	#+OPTIONS: H:4 num:3 toc:2
12	12

+1

-1

Documentation/magit.texi less more

39	39	@finalout
40	40	@titlepage
41	41	@title Magit User Manual
42		@subtitle for version 2.6
	42	@subtitle for version 2.7
43	43	@author Jonas Bernoulli
44	44	@page
45	45	@vskip 0pt plus 1filll

+5

-5

default.mk less more

54	54
55	55	EMACS_VERSION = 24.4
56	56
57		MAGIT_VERSION = 2.6
	57	MAGIT_VERSION = 2.7
58	58	ASYNC_VERSION = 1.5
59	59	DASH_VERSION = 2.12.1
60	60	WITH_EDITOR_VERSION = 2.5.1
61		GIT_COMMIT_VERSION = 2.6.1
62		MAGIT_POPUP_VERSION = 2.6.1
	61	GIT_COMMIT_VERSION = 2.6.2
	62	MAGIT_POPUP_VERSION = 2.6.2
63	63
64	64	ASYNC_MELPA_SNAPSHOT = 20150909.2257
65	65	DASH_MELPA_SNAPSHOT = 20151021.113
66	66	WITH_EDITOR_MELPA_SNAPSHOT = 20160408.201
67		GIT_COMMIT_MELPA_SNAPSHOT = 20160414.251
68		MAGIT_POPUP_MELPA_SNAPSHOT = 20160414.251
	67	GIT_COMMIT_MELPA_SNAPSHOT = 20160425.430
	68	MAGIT_POPUP_MELPA_SNAPSHOT = 20160512.328
69	69
70	70	EMACSBIN ?= emacs
71	71

+1

-1

lisp/git-commit.el less more

10	10	;; Marius Vollmer <marius.vollmer@gmail.com>
11	11	;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
12	12
13		;; Package-Requires: ((emacs "24.4") (dash "20151021.113") (with-editor "20160408.201"))
	13	;; Package-Requires: ((emacs "24.4") (dash "2.12.1") (with-editor "2.5.1"))
14	14	;; Keywords: git tools vc
15	15	;; Homepage: https://github.com/magit/magit
16	16

+1

-1

lisp/magit-popup.el less more

11	11	;; Author: Jonas Bernoulli <jonas@bernoul.li>
12	12	;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
13	13
14		;; Package-Requires: ((emacs "24.4") (async "20150909.2257") (dash "20151021.113"))
	14	;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1"))
15	15	;; Keywords: bindings
16	16	;; Homepage: https://github.com/magit/magit
17	17

+1

-1

lisp/magit.el less more

15	15	;; Rémi Vanicat <vanicat@debian.org>
16	16	;; Yann Hodique <yann.hodique@gmail.com>
17	17
18		;; Package-Requires: ((emacs "24.4") (async "20150909.2257") (dash "20151021.113") (with-editor "20160408.201") (git-commit "20160414.251") (magit-popup "20160414.251"))
	18	;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1") (with-editor "2.5.1") (git-commit "2.6.2") (magit-popup "2.6.2"))
19	19	;; Keywords: git tools vc
20	20	;; Homepage: https://github.com/magit/magit
21	21