Commit baa1b7c054423905cfc6777ba5c002999fd30b3d - magit

+0

-40

~~Documentation/2.6.1.txt~~ less more

0		Magit v2.6.1 Release Notes
1		==========================
2
3		Fixes since v2.6.0
4		------------------
5
6		* When a submodule is manually removed without staging the removal,
7		then the status buffer could no longer be updated.
8
9		* In some cases not all modified submodules were shown in the status
10		buffer.
11
12		* Visiting a blob did turn on `diff-hl-mode' if the global mode is on.
13
14		* Stash and wipref were needlessly signed if signing is enabled.
15
16		* The command `git-commit-save-message' did not strip diffs produced
17		by `git commit --verbose'.
18
19		* Diffs produced by `git commit --verbose' were not completely
20		highlighted in the commit message buffer.
21
22		* When the commit message buffer contains nothing but a single line
23		that does not end with a newline, then a warning was shown about
24		there being a non-empty second line.
25
26		* When installing from Melpa, `async-bytecomp-package-mode' was no
27		longer activated early enough.
28
29		This release also contains documentation updates, typofixes, fixes for
30		minor bugs, and other small improvements.
31
32		Authors
33		-------
34
35		14 Jonas Bernoulli
36		5 Kyle Meyer
37		1 Fritz Grabo
38		1 Ingo Lohmar
39		1 Noam Postavsky

+52

-0

Documentation/2.6.2.txt less more

	0	Magit v2.6.2 Release Notes
	1	==========================
	2
	3	Changes since v2.6.1
	4	--------------------
	5
	6	* Added new section inserter `magit-insert-submodules'. For each
	7	submodule it inserts the module path and a description of its tip.
	8
	9	* When re-adding an already configured but for some reason unstaged
	10	submodule, then `magit-submodule-add' now offers the configured
	11	submodule name as default choice.
	12
	13	Fixes since v2.6.1
	14	------------------
	15
	16	* When possible `git merge (--no-commit\|--edit)' perform fast-forward
	17	merges, which isn't what one would expect. `magit-merge-nocommit'
	18	and `magit-merge-editmsg' now work around that by always using
	19	`--no-ff'.
	20
	21	* The command `magit-log', when called with `--patch' but without
	22	`--graph', deleted the first two characters of file names in the
	23	diff.
	24
	25	* When performing an instant fixup/squash, the rebase often failed
	26	because the commit process still held the lock on `index.lock'.
	27
	28	* The command `magit-submodule-add' offered an invalid default choice
	29	for the module path and allowed selecting a file that isn't a
	30	repository.
	31
	32	* `git-rebase-mode' failed to prevent `save-place-mode' from having an
	33	effect.
	34
	35	* The section inserter `magit-insert-unpulled-from-upstream-or-recent'
	36	failed to insert the recent commits instead when no upstream is
	37	configured.
	38
	39	* Two key bindings in `magit-pull-and-fetch-popup' conflicted.
	40
	41	* The default value for `magit-cygwin-mount-points' checked if
	42	"git.exe" was a cygwin flavor of git, instead of the (possibly user
	43	customized) value of `magit-git-executable'.
	44
	45	Authors
	46	-------
	47
	48	21 Jonas Bernoulli
	49	1 John Mastro
	50	1 Kyle Meyer
	51	1 Noam Postavsky

+1

-1

Documentation/AUTHORS.md less more

4	4	libraries `git-commit.el`, `magit-popup.el`, and `with-editor.el`
5	5	which are distributed as separate Elpa packages.
6	6
7		For statistics see http://magit.vc/stats/authors.html.
	7	For statistics see https://magit.vc/stats/authors.html.
8	8
9	9	Names below are sorted alphabetically.
10	10

+1

-1

Documentation/Makefile less more

64	64	libraries `git-commit.el`, `magit-popup.el`, and `with-editor.el`
65	65	which are distributed as separate Elpa packages.
66	66
67		For statistics see http://magit.vc/stats/authors.html.
	67	For statistics see https://magit.vc/stats/authors.html.
68	68
69	69	Names below are sorted alphabetically.
70	70

+40

-23

Documentation/magit.texi less more

270	270	* I am using an Emacs release older than v24.4: I am using an Emacs release older than v244.
271	271	* I am using a Git release older than v1.9.4: I am using a Git release older than v194.
272	272	* I am using MS Windows and cannot push with Magit::
	273	* I am using OS X and SOMETHING works in shell, but not in Magit: I am using OS X and SOMETHING works in shell but not in Magit.
273	274	* How to install the gitman info manual?::
274	275	* How can I show Git's output?::
275	276	* Diffs contain control sequences::
276	277	* Expanding a file to show the diff causes it to disappear::
277		* Point is wrong in the COMMIT@math{_EDITMSG} buffer::
278		* Can Magit be used as ediff-version-control-package?::
	278	* Point is wrong in the @code{COMMIT_EDITMSG} buffer::
	279	* Can Magit be used as @code{ediff-version-control-package}?::
279	280	* How to show diffs for gpg-encrypted files?::
280	281	* Emacs 24.5 hangs when loading Magit: Emacs 245 hangs when loading Magit.
281		* Symbol's value as function is void --some::
	282	* @code{Symbol's value as function is void --some}::
282	283	* Where is the branch manager::
283	284	@end detailmenu
284	285	@end menu

2139	2140	Insert sections for modules that haven't been pushed to the
2140	2141	push-remote yet. These sections can be expanded to show the
2141	2142	respective commits.
	2143	@end defun
	2144
	2145	@defun magit-insert-submodules
	2146
	2147	Insert sections for all modules. For each section insert the path
	2148	and the output of @code{git describe --tags}.
2142	2149	@end defun
2143	2150
2144	2151	@defun magit-insert-unpulled-cherries

6700	6707	per-repository or per-repository-class basis only. See
6701	6708	@ref{Per-repository configuration,Per-repository configuration}.
6702	6709
6703		@menu
6704		* Committing Performance::
6705		@end menu
6706
6707	6710	@unnumberedsubsubsec Microsoft Windows Performance
6708	6711
6709	6712	In order to update the status buffer, @code{git} has to be run a few dozen

6719	6722	use the latest release. Magit too tries to work around some
6720	6723	Windows-specific issues.
6721	6724
6722		But all these efforts might not be enough, forcing users to make some
6723		changes themselves. For example, according to
6724		@uref{http://stackoverflow.com/questions/4485059}, setting the following Git
6725		variables might also help:
	6725	According to some sources setting the following Git variables can also
	6726	help.
6726	6727
6727	6728	@example
6728		git config --global core.preloadindex true
6729		git config --global core.fscache true
	6729	git config --global core.preloadindex true # default since v2.1
	6730	git config --global core.fscache true # default since v2.8
6730	6731	git config --global gc.auto 256
6731	6732	@end example
6732	6733

6794	6795	actually all exist. You can do so by pruning branches which no longer
6795	6796	exist using @code{f-pa}.
6796	6797
6797		@node Committing Performance
6798	6798	@unnumberedsubsubsec Committing Performance
6799	6799
6800	6800	When you initiate a commit, then Magit by default automatically shows

7642	7642	* I am using an Emacs release older than v24.4: I am using an Emacs release older than v244.
7643	7643	* I am using a Git release older than v1.9.4: I am using a Git release older than v194.
7644	7644	* I am using MS Windows and cannot push with Magit::
	7645	* I am using OS X and SOMETHING works in shell, but not in Magit: I am using OS X and SOMETHING works in shell but not in Magit.
7645	7646	* How to install the gitman info manual?::
7646	7647	* How can I show Git's output?::
7647	7648	* Diffs contain control sequences::
7648	7649	* Expanding a file to show the diff causes it to disappear::
7649		* Point is wrong in the COMMIT@math{_EDITMSG} buffer::
7650		* Can Magit be used as ediff-version-control-package?::
	7650	* Point is wrong in the @code{COMMIT_EDITMSG} buffer::
	7651	* Can Magit be used as @code{ediff-version-control-package}?::
7651	7652	* How to show diffs for gpg-encrypted files?::
7652	7653	* Emacs 24.5 hangs when loading Magit: Emacs 245 hangs when loading Magit.
7653		* Symbol's value as function is void --some::
	7654	* @code{Symbol's value as function is void --some}::
7654	7655	* Where is the branch manager::
7655	7656	@end menu
7656	7657

7679	7680
7680	7681	@node Diffs are collapsed after un-/staging
7681	7682	@section Diffs are collapsed after un-/staging
	7683
	7684	This typically happens on Windows and/or large repositories where
	7685	preparing diffs takes longer than @code{magit-diff-expansion-threshold}. The
	7686	default is one second, try increasing it to a larger value.
7682	7687
7683	7688	Currently when one part of a Magit buffer has to be updated the whole
7684	7689	buffer is recreated from scratch. That obviously isn't good for

7774	7779
7775	7780	Detailed setup instructions can be found at
7776	7781	@uref{https://github.com/magit/magit/wiki/Pushing-with-Magit-from-Windows}.
	7782
	7783	@node I am using OS X and SOMETHING works in shell but not in Magit
	7784	@section I am using OS X and SOMETHING works in shell, but not in Magit
	7785
	7786	This usually occurs because Emacs doesn't have the same environment
	7787	variables as your shell. Try installing and configuring
	7788	@uref{https://github.com/purcell/exec-path-from-shell}. By default it
	7789	synchronizes @code{$PATH}, which helps Magit find the same @code{git} as the one you
	7790	are using on the shell.
	7791
	7792	If SOMETHING is "passphrase caching with gpg-agent for commit and/or
	7793	tag signing", then you'll also need to synchronize @code{$GPG_AGENT_INFO}.
7777	7794
7778	7795	@node How to install the gitman info manual?
7779	7796	@section How to install the gitman info manual?

7874	7891	only undo that setting in Magit by customizing
7875	7892	@code{magit-git-global-arguments}.
7876	7893
7877		@node Point is wrong in the COMMIT@math{_EDITMSG} buffer
7878		@section Point is wrong in the COMMIT@math{_EDITMSG} buffer
	7894	@node Point is wrong in the @code{COMMIT_EDITMSG} buffer
	7895	@section Point is wrong in the @code{COMMIT_EDITMSG} buffer
7879	7896
7880	7897	Neither Magit nor `git-commit` fiddle with point in the buffer used to
7881	7898	write commit messages, so something else must be doing it.

7897	7914	(pointback-mode -1))))
7898	7915	@end lisp
7899	7916
7900		@node Can Magit be used as ediff-version-control-package?
7901		@section Can Magit be used as ediff-version-control-package?
	7917	@node Can Magit be used as @code{ediff-version-control-package}?
	7918	@section Can Magit be used as @code{ediff-version-control-package}?
7902	7919
7903	7920	No, it cannot. For that to work the functions @code{ediff-magit-internal}
7904	7921	and @code{ediff-magit-merge-internal} would have to be implemented, and they

7951	7968	@code{tramp-ssh-controlmaster-options}. Changing your DNS server (e.g. to
7952	7969	Google's @code{8.8.8.8}) may also be sufficient to work around the issue.
7953	7970
7954		@node Symbol's value as function is void --some
7955		@section Symbol's value as function is void --some
	7971	@node @code{Symbol's value as function is void --some}
	7972	@section @code{Symbol's value as function is void --some}
7956	7973
7957	7974	Update @code{dash}, restart Emacs, and then it will be defined.
7958	7975

+5

-5

default.mk less more

56	56	MAGIT_VERSION = 2.6
57	57	ASYNC_VERSION = 1.5
58	58	DASH_VERSION = 2.12.1
59		WITH_EDITOR_VERSION = 2.5.0
60		GIT_COMMIT_VERSION = 2.6.0
61		MAGIT_POPUP_VERSION = 2.6.0
	59	WITH_EDITOR_VERSION = 2.5.1
	60	GIT_COMMIT_VERSION = 2.6.1
	61	MAGIT_POPUP_VERSION = 2.6.1
62	62
63	63	ASYNC_MELPA_SNAPSHOT = 20150909.2257
64	64	DASH_MELPA_SNAPSHOT = 20151021.113
65	65	WITH_EDITOR_MELPA_SNAPSHOT = 20160408.201
66		GIT_COMMIT_MELPA_SNAPSHOT = 20160412.130
67		MAGIT_POPUP_MELPA_SNAPSHOT = 20160408.156
	66	GIT_COMMIT_MELPA_SNAPSHOT = 20160414.251
	67	MAGIT_POPUP_MELPA_SNAPSHOT = 20160414.251
68	68
69	69	EMACSBIN ?= emacs
70	70

+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 "2.12.1") (with-editor "2.5.0"))
	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

+3

-1

lisp/git-rebase.el less more

387	387	(setq-local redisplay-highlight-region-function 'git-rebase-highlight-region)
388	388	(setq-local redisplay-unhighlight-region-function 'git-rebase-unhighlight-region)
389	389	(add-hook 'with-editor-pre-cancel-hook 'git-rebase-autostash-save nil t)
390		(add-hook 'with-editor-post-cancel-hook 'git-rebase-autostash-apply nil t))
	390	(add-hook 'with-editor-post-cancel-hook 'git-rebase-autostash-apply nil t)
	391	(when (boundp 'save-place)
	392	(setq save-place nil)))
391	393
392	394	(defun git-rebase-cancel-confirm (force)
393	395	(or (not (buffer-modified-p)) force (y-or-n-p "Abort this rebase? ")))

+8

-4

lisp/magit-commit.el less more

244	244	current-prefix-arg
245	245	magit-commit-squash-confirm))))
246	246	(let ((magit-commit-show-diff nil))
247		(magit-run-git-with-editor "commit"
248		(unless edit "--no-edit")
249		(concat option "=" commit)
250		args))
	247	(push (concat option "=" commit) args)
	248	(unless edit
	249	(push "--no-edit" args))
	250	(if rebase
	251	(with-editor "GIT_EDITOR"
	252	(let ((magit-process-popup-time -1))
	253	(magit-call-git "commit" args)))
	254	(magit-run-git-with-editor "commit" args)))
251	255	(magit-log-select
252	256	`(lambda (commit)
253	257	(magit-commit-squash-internal ,option commit ',args ,rebase ,edit t)

+3

-1

lisp/magit-diff.el less more

1398	1398	(setq orig (magit-decode-git-path orig)))
1399	1399	(setq file (magit-decode-git-path file))
1400	1400	;; KLUDGE `git-log' ignores `--no-prefix' when `-L' is used.
1401		(when (derived-mode-p 'magit-log-mode)
	1401	(when (and (derived-mode-p 'magit-log-mode)
	1402	(--first (string-match-p "\\`-L" it)
	1403	(nth 1 magit-refresh-args)))
1402	1404	(setq file (substring file 2))
1403	1405	(when orig
1404	1406	(setq orig (substring orig 2))))

+7

-4

lisp/magit-git.el less more

587	587	"Failed to parse Cygwin mount: %S" it))
588	588	;; If --exec-path is not a native Windows path,
589	589	;; then we probably have a cygwin git.
590		(and (not (string-match-p
591		"\\`[a-zA-Z]:"
592		(car (process-lines "git" "--exec-path"))))
593		(ignore-errors (process-lines "mount"))))
	590	(let ((process-environment
	591	(append magit-git-environment process-environment)))
	592	(and (not (string-match-p
	593	"\\`[a-zA-Z]:"
	594	(car (process-lines
	595	magit-git-executable "--exec-path"))))
	596	(ignore-errors (process-lines "mount")))))
594	597	#'> :key (-lambda ((cyg . _win)) (length cyg))))
595	598	"Alist of (CYGWIN . WIN32) directory names.
596	599	Sorted from longest to shortest CYGWIN name."

+5

-4

lisp/magit-log.el less more

1363	1363	not yet been pulled into the current branch. If no upstream is
1364	1364	configured or if the upstream is not ahead of the current branch,
1365	1365	then show the last `magit-log-section-commit-count' commits."
1366		(if (equal (magit-rev-parse "HEAD")
1367		(magit-rev-parse "@{upstream}"))
1368		(magit-insert-recent-commits t)
1369		(magit-insert-unpulled-from-upstream)))
	1366	(let ((upstream (magit-rev-parse "@{upstream}")))
	1367	(if (or (not upstream)
	1368	(equal upstream (magit-rev-parse "HEAD")))
	1369	(magit-insert-recent-commits t)
	1370	(magit-insert-unpulled-from-upstream))))
1370	1371
1371	1372	;;;; Auxiliary Log Sections
1372	1373

+1

-1

lisp/magit-remote.el less more

333	333	(?F "remotes and prune" magit-fetch-all-prune)
334	334	"Fetch"
335	335	(?o "another branch" magit-fetch-branch)
336		(?r "explicit refspec" magit-fetch-refspec)
	336	(?s "explicit refspec" magit-fetch-refspec)
337	337	(?m "submodules" magit-submodule-fetch))
338	338	:default-action 'magit-fetch
339	339	:max-action-columns 1)

+57

-33

lisp/magit-submodule.el less more

45	45
46	46	Optional PATH is the path to the submodule relative to the root
47	47	of the superproject. If it is nil, then the path is determined
48		based on URL.
	48	based on the URL.
49	49
50	50	Optional NAME is the name of the submodule. If it is nil, then
51	51	PATH also becomes the name."
52	52	(interactive
53	53	(magit-with-toplevel
54		(let ((path (read-file-name
55		"Add submodule: " nil nil nil
56		(magit-section-when [file untracked]
57		(directory-file-name (magit-section-value it))))))
58		(when path
59		(setq path (file-name-as-directory (expand-file-name path)))
60		(when (member path (list "" default-directory))
61		(setq path nil)))
	54	(let ((path (magit-completing-read "Add submodules at path"
	55	(magit-untracked-files)
	56	#'magit-git-repo-p nil nil nil
	57	(magit-section-when [file untracked]
	58	(file-relative-name
	59	(magit-section-value it)
	60	default-directory)))))
	61	(unless path
	62	(user-error "No path selected"))
62	63	(list (magit-read-string-ns
63	64	"Remote url"
64		(and path (magit-git-repo-p path t)
65		(let ((default-directory path))
66		(magit-get "remote" (or (magit-get-remote) "origin")
67		"url"))))
68		(and path (directory-file-name (file-relative-name path)))
69		(magit-read-string-ns "Name submodule" path)))))
	65	(let ((default-directory (file-name-as-directory
	66	(expand-file-name path))))
	67	(magit-get "remote" (or (magit-get-remote) "origin") "url")))
	68	(directory-file-name path)
	69	(magit-read-string-ns
	70	"Name submodule" nil nil
	71	(or (--keep (-let [(var val) (split-string it "=")]
	72	(and (equal val path)
	73	(cadr (split-string var "\\."))))
	74	(magit-git-lines "config" "--list" "-f" ".gitmodules"))
	75	(directory-file-name path)))))))
70	76	(magit-run-git "submodule" "add" (and name (list "--name" name)) url path))
71	77
72	78	;;;###autoload

118	124	;;; Sections
119	125
120	126	;;;###autoload
	127	(defun magit-insert-submodules ()
	128	"Insert sections for all modules.
	129	For each section insert the path and the output of `git describe --tags'."
	130	(-when-let (modules (magit-get-submodules))
	131	(magit-insert-section (modules nil t)
	132	(magit-insert-heading "Modules:")
	133	(magit-with-toplevel
	134	(dolist (module modules)
	135	(let ((default-directory
	136	(expand-file-name (file-name-as-directory module))))
	137	(magit-insert-section (file module t)
	138	(insert (format "%-25s " module))
	139	(let ((beg (point)))
	140	(magit-git-insert "describe" "--tags")
	141	(when (eq (point) beg)
	142	(insert ?\n))))))))))
	143
	144	;;;###autoload
121	145	(defun magit-insert-modules-unpulled-from-upstream ()
122	146	"Insert sections for modules that haven't been pulled from the upstream.
123	147	These sections can be expanded to show the respective commits."
124		(magit-insert-submodules "Modules unpulled from @{upstream}"
125		'modules-unpulled-from-upstream
126		'magit-get-upstream-ref
127		"HEAD..%s"))
	148	(magit--insert-modules-logs "Modules unpulled from @{upstream}"
	149	'modules-unpulled-from-upstream
	150	'magit-get-upstream-ref
	151	"HEAD..%s"))
128	152
129	153	;;;###autoload
130	154	(defun magit-insert-modules-unpulled-from-pushremote ()
131	155	"Insert sections for modules that haven't been pulled from the push-remote.
132	156	These sections can be expanded to show the respective commits."
133		(magit-insert-submodules "Modules unpulled from <push-remote>"
134		'modules-unpulled-from-pushremote
135		'magit-get-push-branch
136		"HEAD..%s"))
	157	(magit--insert-modules-logs "Modules unpulled from <push-remote>"
	158	'modules-unpulled-from-pushremote
	159	'magit-get-push-branch
	160	"HEAD..%s"))
137	161
138	162	;;;###autoload
139	163	(defun magit-insert-modules-unpushed-to-upstream ()
140	164	"Insert sections for modules that haven't been pushed to the upstream.
141	165	These sections can be expanded to show the respective commits."
142		(magit-insert-submodules "Modules unmerged into @{upstream}"
143		'modules-unpushed-to-upstream
144		'magit-get-upstream-ref
145		"%s..HEAD"))
	166	(magit--insert-modules-logs "Modules unmerged into @{upstream}"
	167	'modules-unpushed-to-upstream
	168	'magit-get-upstream-ref
	169	"%s..HEAD"))
146	170
147	171	;;;###autoload
148	172	(defun magit-insert-modules-unpushed-to-pushremote ()
149	173	"Insert sections for modules that haven't been pushed to the push-remote.
150	174	These sections can be expanded to show the respective commits."
151		(magit-insert-submodules "Modules unpushed to <push-remote>"
152		'modules-unpushed-to-pushremote
153		'magit-get-push-branch
154		"%s..HEAD"))
155
156		(defun magit-insert-submodules (heading type fn format)
	175	(magit--insert-modules-logs "Modules unpushed to <push-remote>"
	176	'modules-unpushed-to-pushremote
	177	'magit-get-push-branch
	178	"%s..HEAD"))
	179
	180	(defun magit--insert-modules-logs (heading type fn format)
157	181	"For internal use, don't add to a hook."
158	182	(-when-let (modules (magit-get-submodules))
159	183	(magit-insert-section section ((eval type) nil t)

+1

-1

lisp/magit-version.el less more

0	0	;;; magit-version.el --- the Magit version you are using
1	1
2		(setq magit-version "2.6.1")
	2	(setq magit-version "2.6.2")
3	3
4	4	(provide 'magit-version)
5	5

+6

-3

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 "1.5") (dash "2.12.1") (with-editor "2.5.0") (git-commit "2.6.0") (magit-popup "2.6.0"))
	18	;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1") (with-editor "2.5.1") (git-commit "2.6.1") (magit-popup "2.6.1"))
19	19	;; Keywords: git tools vc
20	20	;; Homepage: https://github.com/magit/magit
21	21

1794	1794	"Merge commit REV into the current branch; and edit message.
1795	1795	Perform the merge and prepare a commit message but let the user
1796	1796	edit it.
1797		\n(git merge --edit [ARGS] rev)"
	1797	\n(git merge --edit --no-ff [ARGS] rev)"
1798	1798	(interactive (list (magit-read-other-branch-or-commit "Merge")
1799	1799	(magit-merge-arguments)))
1800	1800	(magit-merge-assert)
	1801	(cl-pushnew "--no-ff" args :test #'equal)
1801	1802	(with-editor "GIT_EDITOR"
1802	1803	(let ((magit-process-popup-time -1))
1803	1804	(magit-run-git-async "merge" "--edit" args rev))))

1807	1808	"Merge commit REV into the current branch; pretending it failed.
1808	1809	Pretend the merge failed to give the user the opportunity to
1809	1810	inspect the merge and change the commit message.
1810		\n(git merge --no-commit [ARGS] rev)"
	1811	\n(git merge --no-commit --no-ff [ARGS] rev)"
1811	1812	(interactive (list (magit-read-other-branch-or-commit "Merge")
1812	1813	(magit-merge-arguments)))
1813	1814	(magit-merge-assert)
	1815	(cl-pushnew "--no-ff" args :test #'equal)
1814	1816	(magit-run-git "merge" "--no-commit" args rev))
1815	1817
1816	1818	;;;###autoload

2273	2275	map)
2274	2276	"Keymap for `magit-file-mode'.")
2275	2277
	2278	;;;###autoload (autoload 'magit-file-popup "magit" nil t)
2276	2279	(magit-define-popup magit-file-popup
2277	2280	"Popup console for Magit commands in file-visiting buffers."
2278	2281	:actions '((?s "Stage" magit-stage-file)