update packages
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
This is magit.info, produced by makeinfo version 6.5 from magit.texi.
|
||||
|
||||
Copyright (C) 2015-2020 Jonas Bernoulli <jonas@bernoul.li>
|
||||
Copyright (C) 2015-2021 Jonas Bernoulli <jonas@bernoul.li>
|
||||
|
||||
You can redistribute this document and/or modify it under the terms
|
||||
of the GNU General Public License as published by the Free Software
|
||||
@@ -41,8 +41,9 @@ beside the ones below, but these didn’t fit well anywhere else.
|
||||
When the region is active, this command saves that to the
|
||||
‘kill-ring’, like ‘kill-ring-save’ would, instead of behaving as
|
||||
described above. If a prefix argument is used and the region is
|
||||
within a hunk, it strips the outer diff marker column before saving
|
||||
the text.
|
||||
within a hunk, then it strips the diff marker column and keeps only
|
||||
either the added or removed lines, depending on the sign of the
|
||||
prefix argument.
|
||||
|
||||
‘M-w’ (‘magit-copy-buffer-revision’)
|
||||
|
||||
@@ -64,7 +65,7 @@ of these commands behave like ‘kill-ring-save’ instead of as described
|
||||
above.
|
||||
|
||||
|
||||
File: magit.info, Node: Wip Modes, Next: Minor Mode for Buffers Visiting Files, Prev: Common Commands, Up: Miscellaneous
|
||||
File: magit.info, Node: Wip Modes, Next: Commands for Buffers Visiting Files, Prev: Common Commands, Up: Miscellaneous
|
||||
|
||||
8.7 Wip Modes
|
||||
=============
|
||||
@@ -308,55 +309,22 @@ making changes that could cause the loss of earlier changes.
|
||||
Mode-line lighter for ‘magit-wip-initial-backup-mode’.
|
||||
|
||||
|
||||
File: magit.info, Node: Minor Mode for Buffers Visiting Files, Next: Minor Mode for Buffers Visiting Blobs, Prev: Wip Modes, Up: Miscellaneous
|
||||
File: magit.info, Node: Commands for Buffers Visiting Files, Next: Minor Mode for Buffers Visiting Blobs, Prev: Wip Modes, Up: Miscellaneous
|
||||
|
||||
8.8 Minor Mode for Buffers Visiting Files
|
||||
=========================================
|
||||
8.8 Commands for Buffers Visiting Files
|
||||
=======================================
|
||||
|
||||
The minor-mode ‘magit-file-mode’ enables certain Magit features in
|
||||
file-visiting buffers belonging to a Git repository. The globalized
|
||||
variant ‘global-magit-file-mode’ enables the local mode in all such
|
||||
buffers. It is enabled by default. Currently the local mode only
|
||||
establishes a few key bindings, but this might be extended in the
|
||||
future.
|
||||
Magit defines a few global key bindings unless the user sets
|
||||
‘magit-define-global-key-bindings’ to ‘nil’. This includes binding ‘C-c
|
||||
M-g’ to ‘magit-file-dispatch’. ‘C-c g’ would be a much better binding
|
||||
but the ‘C-c <letter>’ namespace is reserved for users, meaning that
|
||||
packages are not allowed to use it. If you want to use ‘C-c g’, then
|
||||
you have to add that binding yourself. Also see *note Default
|
||||
Bindings:: and *note (elisp)Key Binding Conventions::.
|
||||
|
||||
-- User Option: global-magit-file-mode
|
||||
If you want a better binding, you have to add it yourself:
|
||||
|
||||
Whether to establish certain Magit key bindings in all
|
||||
file-visiting buffers belonging to any Git repository. This is
|
||||
enabled by default. This globalized mode turns on the local
|
||||
minor-mode ‘magit-file-mode’ in all suitable buffers.
|
||||
|
||||
-- Variable: magit-file-mode-map
|
||||
|
||||
This keymap is used by the local minor-mode ‘magit-file-mode’ and
|
||||
establishes the key bindings described below.
|
||||
|
||||
Note that the default binding for ‘magit-file-dispatch’ is very
|
||||
cumbersome to use and that we recommend that you add a better
|
||||
binding.
|
||||
|
||||
Instead of ‘C-c M-g’ I would have preferred to use ‘C-c g’ because
|
||||
(1) it is similar to ‘C-x g’ (the recommended global binding for
|
||||
‘~magit-status’), (2) we cannot use ‘C-c C-g’ because we have been
|
||||
recommending that that be bound to ‘magit-dispatch’ for a long
|
||||
time, (3) we cannot use ‘C-x C-g’ because that is a convenient way
|
||||
of aborting the incomplete key sequence ‘C-x’, and most importantly
|
||||
(4) it would make it much easier to type the next key (a suffix
|
||||
binding) because most of those are letters.
|
||||
|
||||
For example ‘C-c g b’ is much easier to type than ‘C-c M-g b’. For
|
||||
suffix bindings that use uppercase letters, the default is just
|
||||
horrible—having to use e.g. ‘C-c M-g B’ (‘Control+c Meta+g
|
||||
Shift+b’) would drive anyone up the walls (or to Vim).
|
||||
|
||||
However ‘C-c LETTER’ bindings are reserved for users (see *note
|
||||
(elisp)Key Binding Conventions::). Packages are forbidden from
|
||||
using those. Doing so anyway is considered heresy. Therefore if
|
||||
you want a better binding, you have to add it yourself:
|
||||
|
||||
(define-key magit-file-mode-map
|
||||
(kbd "C-c g") 'magit-file-dispatch)
|
||||
(global-set-key (kbd "C-c g") 'magit-file-dispatch)
|
||||
|
||||
The key bindings shown below assume that you have not improved the
|
||||
binding for ‘magit-file-dispatch’.
|
||||
@@ -366,6 +334,9 @@ binding for ‘magit-file-dispatch’.
|
||||
This transient prefix command binds the following suffix commands
|
||||
and displays them in a temporary buffer until a suffix is invoked.
|
||||
|
||||
When invoked in a buffer that does not visit a file, then it falls
|
||||
back to regular ‘magit-dispatch’.
|
||||
|
||||
‘C-c M-g s’ (‘magit-stage-file’)
|
||||
|
||||
Stage all changes to the file being visited in the current buffer.
|
||||
@@ -484,7 +455,7 @@ leave edit mode (‘C-g’). Also see *note (transient)Enabling and
|
||||
Disabling Suffixes::.
|
||||
|
||||
|
||||
File: magit.info, Node: Minor Mode for Buffers Visiting Blobs, Prev: Minor Mode for Buffers Visiting Files, Up: Miscellaneous
|
||||
File: magit.info, Node: Minor Mode for Buffers Visiting Blobs, Prev: Commands for Buffers Visiting Files, Up: Miscellaneous
|
||||
|
||||
8.9 Minor Mode for Buffers Visiting Blobs
|
||||
=========================================
|
||||
@@ -620,6 +591,7 @@ might want to customize, for safety and/or performance reasons.
|
||||
|
||||
* Safety::
|
||||
* Performance::
|
||||
* Default Bindings::
|
||||
|
||||
|
||||
File: magit.info, Node: Safety, Next: Performance, Up: Essential Settings
|
||||
@@ -659,7 +631,7 @@ to make an informed decision you should see *note Risk of Reverting
|
||||
Automatically::.
|
||||
|
||||
|
||||
File: magit.info, Node: Performance, Prev: Safety, Up: Essential Settings
|
||||
File: magit.info, Node: Performance, Next: Default Bindings, Prev: Safety, Up: Essential Settings
|
||||
|
||||
9.2.2 Performance
|
||||
-----------------
|
||||
@@ -862,15 +834,61 @@ more information.
|
||||
|
||||
On Catalina, and potentially other macOS releases, there may be a
|
||||
performance problem where any action takes 20 times longer on Darwin
|
||||
than on Linux. This can be fixed by setting ‘magit-git-executable’ to
|
||||
the absolute path of the ‘git’ executable, instead of relying on
|
||||
resolving the ‘$PATH’.
|
||||
than on Linux. This can be worked around by setting
|
||||
‘magit-git-executable’ to the absolute path of the ‘git’ executable,
|
||||
instead of relying on resolving the ‘$PATH’. You should not do that if
|
||||
you want to use Magit on remote machines using Tramp and if ‘git’ is not
|
||||
installed in the same location on those machines.
|
||||
|
||||
---------- Footnotes ----------
|
||||
|
||||
(1)
|
||||
<https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html>
|
||||
|
||||
|
||||
File: magit.info, Node: Default Bindings, Prev: Performance, Up: Essential Settings
|
||||
|
||||
9.2.3 Default Bindings
|
||||
----------------------
|
||||
|
||||
-- User Option: magit-define-global-key-bindings
|
||||
|
||||
This option controls whether some Magit commands are automatically
|
||||
bound in the global keymap even before Magit is used for the first
|
||||
time in the current session.
|
||||
|
||||
If this variable is non-nil, which it is by default, then the
|
||||
following bindings may be added to the global keymap.
|
||||
|
||||
‘C-x g’ ‘magit-status’
|
||||
‘C-x M-g’ ‘magit-dispatch’
|
||||
‘C-c M-g’ ‘magit-file-dispatch’
|
||||
|
||||
These bindings may be added when ‘after-init-hook’ is called. Each
|
||||
binding is added if and only if at that time no other key is bound
|
||||
to the same command and no other command is bound to the same key.
|
||||
In other words we try to avoid adding bindings that are
|
||||
unnecessary, as well as bindings that conflict with other bindings.
|
||||
|
||||
Adding the above bindings is delayed until ‘after-init-hook’ is
|
||||
called to allow users to set the variable anywhere in their init
|
||||
file (without having to make sure to do so before ‘magit’ is loaded
|
||||
or autoloaded) and to increase the likelihood that all the
|
||||
potentially conflicting user bindings have already been added.
|
||||
|
||||
Setting this variable after the hook has already been called has no
|
||||
effect.
|
||||
|
||||
We recommend that you bind ‘C-c g’ instead of ‘C-c M-g’ to
|
||||
‘magit-file-dispatch’. The former is a much better binding but the
|
||||
‘C-c <letter>’ namespace is strictly reserved for users; preventing
|
||||
Magit from using it by default.
|
||||
|
||||
(global-set-key (kbd "C-c g") 'magit-file-dispatch)
|
||||
|
||||
Also see *note Commands for Buffers Visiting Files:: and *note
|
||||
(elisp)Key Binding Conventions::.
|
||||
|
||||
|
||||
File: magit.info, Node: Plumbing, Next: FAQ, Prev: Customizing, Up: Top
|
||||
|
||||
@@ -1697,6 +1715,7 @@ A.1 FAQ - How to ...?
|
||||
|
||||
* Menu:
|
||||
|
||||
* How to pronounce Magit?::
|
||||
* How to show git's output?::
|
||||
* How to install the gitman info manual?::
|
||||
* How to show diffs for gpg-encrypted files?::
|
||||
@@ -1705,9 +1724,31 @@ A.1 FAQ - How to ...?
|
||||
* Should I disable VC?::
|
||||
|
||||
|
||||
File: magit.info, Node: How to show git's output?, Next: How to install the gitman info manual?, Up: FAQ - How to ...?
|
||||
File: magit.info, Node: How to pronounce Magit?, Next: How to show git's output?, Up: FAQ - How to ...?
|
||||
|
||||
A.1.1 How to show git’s output?
|
||||
A.1.1 How to pronounce Magit?
|
||||
-----------------------------
|
||||
|
||||
Either ‘mu[m's] git’ or ‘magi{c => t}’ is fine.
|
||||
|
||||
The slogan is "It’s Magit! The magical Git client", so it makes
|
||||
sense to pronounce Magit like magic, while taking into account that C
|
||||
and T do not sound the same.
|
||||
|
||||
The German "Magie" is not pronounced the same as the English "magic",
|
||||
so if you speak German then you can use the above rational to justify
|
||||
using the former pronunciation; ‘Mag{ie => it}’.
|
||||
|
||||
You can also choose to use the former pronunciation just because you
|
||||
like it better.
|
||||
|
||||
Also see <https://magit.vc/assets/videos/magic.mp4>. Also see
|
||||
<https://emacs.stackexchange.com/questions/13696>.
|
||||
|
||||
|
||||
File: magit.info, Node: How to show git's output?, Next: How to install the gitman info manual?, Prev: How to pronounce Magit?, Up: FAQ - How to ...?
|
||||
|
||||
A.1.2 How to show git’s output?
|
||||
-------------------------------
|
||||
|
||||
To show the output of recently run git commands, press ‘$’ (or, if that
|
||||
@@ -1724,7 +1765,7 @@ debugging purposes, it’s possible to do so anyway by setting
|
||||
|
||||
File: magit.info, Node: How to install the gitman info manual?, Next: How to show diffs for gpg-encrypted files?, Prev: How to show git's output?, Up: FAQ - How to ...?
|
||||
|
||||
A.1.2 How to install the gitman info manual?
|
||||
A.1.3 How to install the gitman info manual?
|
||||
--------------------------------------------
|
||||
|
||||
Git’s manpages can be exported as an info manual called ‘gitman’.
|
||||
@@ -1745,7 +1786,7 @@ one of the supported packages ‘man’ or ‘woman’, e.g.:
|
||||
|
||||
File: magit.info, Node: How to show diffs for gpg-encrypted files?, Next: How does branching and pushing work?, Prev: How to install the gitman info manual?, Up: FAQ - How to ...?
|
||||
|
||||
A.1.3 How to show diffs for gpg-encrypted files?
|
||||
A.1.4 How to show diffs for gpg-encrypted files?
|
||||
------------------------------------------------
|
||||
|
||||
Git supports showing diffs for encrypted files, but has to be told to do
|
||||
@@ -1758,7 +1799,7 @@ affects the diffs displayed inside Magit.
|
||||
|
||||
File: magit.info, Node: How does branching and pushing work?, Next: Can Magit be used as ediff-version-control-package?, Prev: How to show diffs for gpg-encrypted files?, Up: FAQ - How to ...?
|
||||
|
||||
A.1.4 How does branching and pushing work?
|
||||
A.1.5 How does branching and pushing work?
|
||||
------------------------------------------
|
||||
|
||||
Please see *note Branching:: and
|
||||
@@ -1767,7 +1808,7 @@ Please see *note Branching:: and
|
||||
|
||||
File: magit.info, Node: Can Magit be used as ediff-version-control-package?, Next: Should I disable VC?, Prev: How does branching and pushing work?, Up: FAQ - How to ...?
|
||||
|
||||
A.1.5 Can Magit be used as ‘ediff-version-control-package’?
|
||||
A.1.6 Can Magit be used as ‘ediff-version-control-package’?
|
||||
-----------------------------------------------------------
|
||||
|
||||
No, it cannot. For that to work the functions ‘ediff-magit-internal’
|
||||
@@ -1801,7 +1842,7 @@ only shows yet-to-be resolved conflicts.
|
||||
|
||||
File: magit.info, Node: Should I disable VC?, Prev: Can Magit be used as ediff-version-control-package?, Up: FAQ - How to ...?
|
||||
|
||||
A.1.6 Should I disable VC?
|
||||
A.1.7 Should I disable VC?
|
||||
--------------------------
|
||||
|
||||
If you don’t use VC (the built-in version control interface) then you
|
||||
@@ -2025,8 +2066,9 @@ to try. Personally I use:
|
||||
$ EDITOR="emacsclient --alternate-editor emacs" git commit
|
||||
|
||||
This will actually end up using ‘emacs’, not ‘emacsclient’. If you
|
||||
do this, then can still edit the commit message but ‘git-commit-mode’
|
||||
won’t be used and you have to exit ‘emacs’ to finish the process.
|
||||
do this, then you can still edit the commit message but
|
||||
‘git-commit-mode’ won’t be used and you have to exit ‘emacs’ to finish
|
||||
the process.
|
||||
|
||||
Tautology ahead. If you want to be able to use ‘emacsclient’ to
|
||||
connect to a running ‘emacs’ instance, even though no ‘emacs’ instance
|
||||
@@ -2163,27 +2205,28 @@ Appendix C Keystroke Index
|
||||
* A s: Cherry Picking. (line 76)
|
||||
* A s <1>: Cherry Picking. (line 94)
|
||||
* B: Bisecting. (line 8)
|
||||
* b: Blaming. (line 105)
|
||||
* b: Blaming. (line 102)
|
||||
* b <1>: Branch Commands. (line 12)
|
||||
* b <2>: Editing Rebase Sequences.
|
||||
(line 85)
|
||||
* B B: Bisecting. (line 16)
|
||||
* B b: Bisecting. (line 31)
|
||||
* B b: Bisecting. (line 34)
|
||||
* b b: Branch Commands. (line 49)
|
||||
* b C: Branch Commands. (line 29)
|
||||
* b c: Branch Commands. (line 67)
|
||||
* B g: Bisecting. (line 36)
|
||||
* B k: Bisecting. (line 41)
|
||||
* B g: Bisecting. (line 39)
|
||||
* B k: Bisecting. (line 51)
|
||||
* b k: Branch Commands. (line 147)
|
||||
* b l: Branch Commands. (line 74)
|
||||
* B m: Bisecting. (line 44)
|
||||
* b n: Branch Commands. (line 57)
|
||||
* B r: Bisecting. (line 47)
|
||||
* B r: Bisecting. (line 57)
|
||||
* b r: Branch Commands. (line 153)
|
||||
* B s: Bisecting. (line 24)
|
||||
* B s: Bisecting. (line 27)
|
||||
* b s: Branch Commands. (line 97)
|
||||
* b S: Branch Commands. (line 125)
|
||||
* b x: Branch Commands. (line 131)
|
||||
* c: Blaming. (line 138)
|
||||
* c: Blaming. (line 135)
|
||||
* C: Cloning Repository. (line 20)
|
||||
* c <1>: Initiating a Commit. (line 8)
|
||||
* c <2>: Editing Rebase Sequences.
|
||||
@@ -2245,39 +2288,39 @@ Appendix C Keystroke Index
|
||||
(line 29)
|
||||
* C-c C-w: Using the Revision Stack.
|
||||
(line 6)
|
||||
* C-c M-g: Minor Mode for Buffers Visiting Files.
|
||||
(line 54)
|
||||
* C-c M-g B: Blaming. (line 21)
|
||||
* C-c M-g b: Blaming. (line 32)
|
||||
* C-c M-g B <1>: Minor Mode for Buffers Visiting Files.
|
||||
(line 123)
|
||||
* C-c M-g B b: Blaming. (line 33)
|
||||
* C-c M-g B e: Blaming. (line 67)
|
||||
* C-c M-g B f: Blaming. (line 58)
|
||||
* C-c M-g B r: Blaming. (line 49)
|
||||
* C-c M-g c: Minor Mode for Buffers Visiting Files.
|
||||
(line 68)
|
||||
* C-c M-g D: Minor Mode for Buffers Visiting Files.
|
||||
(line 75)
|
||||
* C-c M-g d: Minor Mode for Buffers Visiting Files.
|
||||
(line 86)
|
||||
* C-c M-g e: Blaming. (line 66)
|
||||
* C-c M-g e <1>: Minor Mode for Buffers Visiting Files.
|
||||
(line 136)
|
||||
* C-c M-g f: Blaming. (line 57)
|
||||
* C-c M-g L: Minor Mode for Buffers Visiting Files.
|
||||
(line 96)
|
||||
* C-c M-g l: Minor Mode for Buffers Visiting Files.
|
||||
(line 107)
|
||||
* C-c M-g p: Minor Mode for Buffers Visiting Files.
|
||||
(line 146)
|
||||
* C-c M-g r: Blaming. (line 48)
|
||||
* C-c M-g s: Minor Mode for Buffers Visiting Files.
|
||||
(line 59)
|
||||
* C-c M-g t: Minor Mode for Buffers Visiting Files.
|
||||
(line 114)
|
||||
* C-c M-g u: Minor Mode for Buffers Visiting Files.
|
||||
(line 63)
|
||||
* C-c M-g: Commands for Buffers Visiting Files.
|
||||
(line 21)
|
||||
* C-c M-g B: Blaming. (line 18)
|
||||
* C-c M-g b: Blaming. (line 29)
|
||||
* C-c M-g B <1>: Commands for Buffers Visiting Files.
|
||||
(line 93)
|
||||
* C-c M-g B b: Blaming. (line 30)
|
||||
* C-c M-g B e: Blaming. (line 64)
|
||||
* C-c M-g B f: Blaming. (line 55)
|
||||
* C-c M-g B r: Blaming. (line 46)
|
||||
* C-c M-g c: Commands for Buffers Visiting Files.
|
||||
(line 38)
|
||||
* C-c M-g D: Commands for Buffers Visiting Files.
|
||||
(line 45)
|
||||
* C-c M-g d: Commands for Buffers Visiting Files.
|
||||
(line 56)
|
||||
* C-c M-g e: Blaming. (line 63)
|
||||
* C-c M-g e <1>: Commands for Buffers Visiting Files.
|
||||
(line 106)
|
||||
* C-c M-g f: Blaming. (line 54)
|
||||
* C-c M-g L: Commands for Buffers Visiting Files.
|
||||
(line 66)
|
||||
* C-c M-g l: Commands for Buffers Visiting Files.
|
||||
(line 77)
|
||||
* C-c M-g p: Commands for Buffers Visiting Files.
|
||||
(line 116)
|
||||
* C-c M-g r: Blaming. (line 45)
|
||||
* C-c M-g s: Commands for Buffers Visiting Files.
|
||||
(line 29)
|
||||
* C-c M-g t: Commands for Buffers Visiting Files.
|
||||
(line 84)
|
||||
* C-c M-g u: Commands for Buffers Visiting Files.
|
||||
(line 33)
|
||||
* C-c M-i: Commit Pseudo Headers.
|
||||
(line 42)
|
||||
* C-c M-s: Editing Commit Messages.
|
||||
@@ -2306,7 +2349,7 @@ Appendix C Keystroke Index
|
||||
* DEL: Log Buffer. (line 45)
|
||||
* DEL <1>: Commands Available in Diffs.
|
||||
(line 60)
|
||||
* DEL <2>: Blaming. (line 92)
|
||||
* DEL <2>: Blaming. (line 89)
|
||||
* DEL <3>: Editing Rebase Sequences.
|
||||
(line 28)
|
||||
* e: Ediffing. (line 9)
|
||||
@@ -2403,8 +2446,8 @@ Appendix C Keystroke Index
|
||||
(line 38)
|
||||
* M-p <2>: Editing Rebase Sequences.
|
||||
(line 43)
|
||||
* M-w: Blaming. (line 130)
|
||||
* M-w <1>: Common Commands. (line 27)
|
||||
* M-w: Blaming. (line 127)
|
||||
* M-w <1>: Common Commands. (line 28)
|
||||
* M-x magit-debug-git-executable: Git Executable. (line 45)
|
||||
* M-x magit-debug-git-executable <1>: Debugging Tools. (line 36)
|
||||
* M-x magit-describe-section-briefly: Section Types and Values.
|
||||
@@ -2431,8 +2474,8 @@ Appendix C Keystroke Index
|
||||
* Mt: Editing Rebase Sequences.
|
||||
(line 132)
|
||||
* n: Section Movement. (line 16)
|
||||
* n <1>: Blaming. (line 109)
|
||||
* N: Blaming. (line 113)
|
||||
* n <1>: Blaming. (line 106)
|
||||
* N: Blaming. (line 110)
|
||||
* n <2>: Editing Rebase Sequences.
|
||||
(line 39)
|
||||
* n <3>: Minor Mode for Buffers Visiting Blobs.
|
||||
@@ -2456,8 +2499,8 @@ Appendix C Keystroke Index
|
||||
* o s: Submodule Transient. (line 44)
|
||||
* o u: Submodule Transient. (line 39)
|
||||
* p: Section Movement. (line 10)
|
||||
* p <1>: Blaming. (line 117)
|
||||
* P: Blaming. (line 121)
|
||||
* p <1>: Blaming. (line 114)
|
||||
* P: Blaming. (line 118)
|
||||
* p <2>: Editing Rebase Sequences.
|
||||
(line 35)
|
||||
* P <1>: Pushing. (line 9)
|
||||
@@ -2474,7 +2517,7 @@ Appendix C Keystroke Index
|
||||
* P u: Pushing. (line 23)
|
||||
* q: Quitting Windows. (line 6)
|
||||
* q <1>: Log Buffer. (line 14)
|
||||
* q <2>: Blaming. (line 125)
|
||||
* q <2>: Blaming. (line 122)
|
||||
* q <3>: Minor Mode for Buffers Visiting Blobs.
|
||||
(line 20)
|
||||
* r: Rebasing. (line 9)
|
||||
@@ -2496,7 +2539,7 @@ Appendix C Keystroke Index
|
||||
* RET: References Buffer. (line 181)
|
||||
* RET <1>: Visiting Files and Blobs from a Diff.
|
||||
(line 8)
|
||||
* RET <2>: Blaming. (line 78)
|
||||
* RET <2>: Blaming. (line 75)
|
||||
* RET <3>: Editing Rebase Sequences.
|
||||
(line 16)
|
||||
* s: Staging and Unstaging.
|
||||
@@ -2509,7 +2552,7 @@ Appendix C Keystroke Index
|
||||
* SPC: Log Buffer. (line 35)
|
||||
* SPC <1>: Commands Available in Diffs.
|
||||
(line 56)
|
||||
* SPC <2>: Blaming. (line 82)
|
||||
* SPC <2>: Blaming. (line 79)
|
||||
* SPC <3>: Editing Rebase Sequences.
|
||||
(line 21)
|
||||
* t: Editing Rebase Sequences.
|
||||
@@ -2666,35 +2709,36 @@ Appendix D Command Index
|
||||
* magit-am-skip: Maildir Patches. (line 38)
|
||||
* magit-apply: Applying. (line 33)
|
||||
* magit-bisect: Bisecting. (line 8)
|
||||
* magit-bisect-bad: Bisecting. (line 31)
|
||||
* magit-bisect-good: Bisecting. (line 36)
|
||||
* magit-bisect-reset: Bisecting. (line 47)
|
||||
* magit-bisect-run: Bisecting. (line 24)
|
||||
* magit-bisect-skip: Bisecting. (line 41)
|
||||
* magit-bisect-bad: Bisecting. (line 34)
|
||||
* magit-bisect-good: Bisecting. (line 39)
|
||||
* magit-bisect-mark: Bisecting. (line 44)
|
||||
* magit-bisect-reset: Bisecting. (line 57)
|
||||
* magit-bisect-run: Bisecting. (line 27)
|
||||
* magit-bisect-skip: Bisecting. (line 51)
|
||||
* magit-bisect-start: Bisecting. (line 16)
|
||||
* magit-blame: Blaming. (line 21)
|
||||
* magit-blame <1>: Blaming. (line 105)
|
||||
* magit-blame <2>: Minor Mode for Buffers Visiting Files.
|
||||
(line 123)
|
||||
* magit-blame-addition: Blaming. (line 32)
|
||||
* magit-blame-addition <1>: Blaming. (line 33)
|
||||
* magit-blame-copy-hash: Blaming. (line 130)
|
||||
* magit-blame-cycle-style: Blaming. (line 138)
|
||||
* magit-blame-echo: Blaming. (line 66)
|
||||
* magit-blame-echo <1>: Blaming. (line 67)
|
||||
* magit-blame-next-chunk: Blaming. (line 109)
|
||||
* magit-blame-next-chunk-same-commit: Blaming. (line 113)
|
||||
* magit-blame-previous-chunk: Blaming. (line 117)
|
||||
* magit-blame-previous-chunk-same-commit: Blaming. (line 121)
|
||||
* magit-blame-quit: Blaming. (line 125)
|
||||
* magit-blame-removal: Blaming. (line 48)
|
||||
* magit-blame-removal <1>: Blaming. (line 49)
|
||||
* magit-blame-reverse: Blaming. (line 57)
|
||||
* magit-blame-reverse <1>: Blaming. (line 58)
|
||||
* magit-blame: Blaming. (line 18)
|
||||
* magit-blame <1>: Blaming. (line 102)
|
||||
* magit-blame <2>: Commands for Buffers Visiting Files.
|
||||
(line 93)
|
||||
* magit-blame-addition: Blaming. (line 29)
|
||||
* magit-blame-addition <1>: Blaming. (line 30)
|
||||
* magit-blame-copy-hash: Blaming. (line 127)
|
||||
* magit-blame-cycle-style: Blaming. (line 135)
|
||||
* magit-blame-echo: Blaming. (line 63)
|
||||
* magit-blame-echo <1>: Blaming. (line 64)
|
||||
* magit-blame-next-chunk: Blaming. (line 106)
|
||||
* magit-blame-next-chunk-same-commit: Blaming. (line 110)
|
||||
* magit-blame-previous-chunk: Blaming. (line 114)
|
||||
* magit-blame-previous-chunk-same-commit: Blaming. (line 118)
|
||||
* magit-blame-quit: Blaming. (line 122)
|
||||
* magit-blame-removal: Blaming. (line 45)
|
||||
* magit-blame-removal <1>: Blaming. (line 46)
|
||||
* magit-blame-reverse: Blaming. (line 54)
|
||||
* magit-blame-reverse <1>: Blaming. (line 55)
|
||||
* magit-blob-next: Minor Mode for Buffers Visiting Blobs.
|
||||
(line 16)
|
||||
* magit-blob-previous: Minor Mode for Buffers Visiting Files.
|
||||
(line 146)
|
||||
* magit-blob-previous: Commands for Buffers Visiting Files.
|
||||
(line 116)
|
||||
* magit-blob-previous <1>: Minor Mode for Buffers Visiting Blobs.
|
||||
(line 12)
|
||||
* magit-branch: Branch Commands. (line 12)
|
||||
@@ -2733,8 +2777,8 @@ Appendix D Command Index
|
||||
* magit-clone-shallow-exclude: Cloning Repository. (line 61)
|
||||
* magit-clone-shallow-since: Cloning Repository. (line 54)
|
||||
* magit-commit: Initiating a Commit. (line 8)
|
||||
* magit-commit <1>: Minor Mode for Buffers Visiting Files.
|
||||
(line 68)
|
||||
* magit-commit <1>: Commands for Buffers Visiting Files.
|
||||
(line 38)
|
||||
* magit-commit-amend: Initiating a Commit. (line 19)
|
||||
* magit-commit-augment: Initiating a Commit. (line 67)
|
||||
* magit-commit-create: Initiating a Commit. (line 14)
|
||||
@@ -2744,7 +2788,7 @@ Appendix D Command Index
|
||||
* magit-commit-instant-squash: Initiating a Commit. (line 63)
|
||||
* magit-commit-reword: Initiating a Commit. (line 33)
|
||||
* magit-commit-squash: Initiating a Commit. (line 55)
|
||||
* magit-copy-buffer-revision: Common Commands. (line 27)
|
||||
* magit-copy-buffer-revision: Common Commands. (line 28)
|
||||
* magit-copy-section-value: Common Commands. (line 10)
|
||||
* magit-cycle-margin-style: Log Margin. (line 70)
|
||||
* magit-debug-git-executable: Git Executable. (line 45)
|
||||
@@ -2753,10 +2797,10 @@ Appendix D Command Index
|
||||
(line 13)
|
||||
* magit-describe-section-briefly <1>: Matching Sections. (line 6)
|
||||
* magit-diff: Diffing. (line 21)
|
||||
* magit-diff <1>: Minor Mode for Buffers Visiting Files.
|
||||
(line 75)
|
||||
* magit-diff-buffer-file: Minor Mode for Buffers Visiting Files.
|
||||
(line 86)
|
||||
* magit-diff <1>: Commands for Buffers Visiting Files.
|
||||
(line 45)
|
||||
* magit-diff-buffer-file: Commands for Buffers Visiting Files.
|
||||
(line 56)
|
||||
* magit-diff-default-context: Refreshing Diffs. (line 73)
|
||||
* magit-diff-dwim: Diffing. (line 27)
|
||||
* magit-diff-edit-hunk-commit: Commands Available in Diffs.
|
||||
@@ -2771,9 +2815,9 @@ Appendix D Command Index
|
||||
* magit-diff-save-default-arguments: Refreshing Diffs. (line 29)
|
||||
* magit-diff-set-default-arguments: Refreshing Diffs. (line 22)
|
||||
* magit-diff-show-or-scroll-down: Log Buffer. (line 45)
|
||||
* magit-diff-show-or-scroll-down <1>: Blaming. (line 92)
|
||||
* magit-diff-show-or-scroll-down <1>: Blaming. (line 89)
|
||||
* magit-diff-show-or-scroll-up: Log Buffer. (line 35)
|
||||
* magit-diff-show-or-scroll-up <1>: Blaming. (line 82)
|
||||
* magit-diff-show-or-scroll-up <1>: Blaming. (line 79)
|
||||
* magit-diff-staged: Diffing. (line 51)
|
||||
* magit-diff-switch-range-type: Refreshing Diffs. (line 41)
|
||||
* magit-diff-toggle-file-filter: Refreshing Diffs. (line 51)
|
||||
@@ -2809,8 +2853,8 @@ Appendix D Command Index
|
||||
* magit-ediff-show-unstaged: Ediffing. (line 53)
|
||||
* magit-ediff-show-working-tree: Ediffing. (line 61)
|
||||
* magit-ediff-stage: Ediffing. (line 48)
|
||||
* magit-edit-line-commit: Minor Mode for Buffers Visiting Files.
|
||||
(line 136)
|
||||
* magit-edit-line-commit: Commands for Buffers Visiting Files.
|
||||
(line 106)
|
||||
* magit-emacs-Q-command: Debugging Tools. (line 16)
|
||||
* magit-fetch: Fetching. (line 9)
|
||||
* magit-fetch-all: Fetching. (line 50)
|
||||
@@ -2821,16 +2865,16 @@ Appendix D Command Index
|
||||
* magit-fetch-other: Fetching. (line 36)
|
||||
* magit-fetch-refspec: Fetching. (line 45)
|
||||
* magit-file-checkout: Resetting. (line 50)
|
||||
* magit-file-checkout <1>: Minor Mode for Buffers Visiting Files.
|
||||
(line 165)
|
||||
* magit-file-delete: Minor Mode for Buffers Visiting Files.
|
||||
(line 157)
|
||||
* magit-file-dispatch: Minor Mode for Buffers Visiting Files.
|
||||
(line 54)
|
||||
* magit-file-rename: Minor Mode for Buffers Visiting Files.
|
||||
(line 153)
|
||||
* magit-file-untrack: Minor Mode for Buffers Visiting Files.
|
||||
(line 161)
|
||||
* magit-file-checkout <1>: Commands for Buffers Visiting Files.
|
||||
(line 135)
|
||||
* magit-file-delete: Commands for Buffers Visiting Files.
|
||||
(line 127)
|
||||
* magit-file-dispatch: Commands for Buffers Visiting Files.
|
||||
(line 21)
|
||||
* magit-file-rename: Commands for Buffers Visiting Files.
|
||||
(line 123)
|
||||
* magit-file-untrack: Commands for Buffers Visiting Files.
|
||||
(line 131)
|
||||
* magit-find-file: General-Purpose Visit Commands.
|
||||
(line 9)
|
||||
* magit-find-file-other-frame: General-Purpose Visit Commands.
|
||||
@@ -2854,13 +2898,13 @@ Appendix D Command Index
|
||||
* magit-list-submodules: Listing Submodules. (line 13)
|
||||
* magit-list-submodules <1>: Submodule Transient. (line 54)
|
||||
* magit-log: Logging. (line 29)
|
||||
* magit-log <1>: Minor Mode for Buffers Visiting Files.
|
||||
(line 96)
|
||||
* magit-log <1>: Commands for Buffers Visiting Files.
|
||||
(line 66)
|
||||
* magit-log-all: Logging. (line 60)
|
||||
* magit-log-all-branches: Logging. (line 56)
|
||||
* magit-log-branches: Logging. (line 52)
|
||||
* magit-log-buffer-file: Minor Mode for Buffers Visiting Files.
|
||||
(line 107)
|
||||
* magit-log-buffer-file: Commands for Buffers Visiting Files.
|
||||
(line 77)
|
||||
* magit-log-bury-buffer: Log Buffer. (line 14)
|
||||
* magit-log-current: Logging. (line 35)
|
||||
* magit-log-double-commit-limit: Log Buffer. (line 61)
|
||||
@@ -2876,8 +2920,8 @@ Appendix D Command Index
|
||||
* magit-log-select-quit: Select from Log. (line 26)
|
||||
* magit-log-set-default-arguments: Refreshing Logs. (line 22)
|
||||
* magit-log-toggle-commit-limit: Log Buffer. (line 55)
|
||||
* magit-log-trace-definition: Minor Mode for Buffers Visiting Files.
|
||||
(line 114)
|
||||
* magit-log-trace-definition: Commands for Buffers Visiting Files.
|
||||
(line 84)
|
||||
* magit-margin-settings: Log Margin. (line 57)
|
||||
* magit-merge: Merging. (line 9)
|
||||
* magit-merge <1>: Merging. (line 89)
|
||||
@@ -2920,7 +2964,7 @@ Appendix D Command Index
|
||||
* magit-push-refspecs: Pushing. (line 41)
|
||||
* magit-push-tag: Pushing. (line 66)
|
||||
* magit-push-tags: Pushing. (line 58)
|
||||
* magit-push-to-remote remote args: Pushing. (line 85)
|
||||
* magit-push-to-remote remote args: Pushing. (line 92)
|
||||
* magit-rebase: Rebasing. (line 9)
|
||||
* magit-rebase-abort: Rebasing. (line 123)
|
||||
* magit-rebase-autosquash: Rebasing. (line 84)
|
||||
@@ -3010,7 +3054,7 @@ Appendix D Command Index
|
||||
* magit-shell-command-topdir: Running Git Manually.
|
||||
(line 35)
|
||||
* magit-show-commit: Diffing. (line 69)
|
||||
* magit-show-commit <1>: Blaming. (line 78)
|
||||
* magit-show-commit <1>: Blaming. (line 75)
|
||||
* magit-show-refs: References Buffer. (line 6)
|
||||
* magit-show-refs-current: References Buffer. (line 26)
|
||||
* magit-show-refs-head: References Buffer. (line 21)
|
||||
@@ -3022,8 +3066,8 @@ Appendix D Command Index
|
||||
(line 28)
|
||||
* magit-stage-file: Staging from File-Visiting Buffers.
|
||||
(line 10)
|
||||
* magit-stage-file <1>: Minor Mode for Buffers Visiting Files.
|
||||
(line 59)
|
||||
* magit-stage-file <1>: Commands for Buffers Visiting Files.
|
||||
(line 29)
|
||||
* magit-stage-modified: Staging and Unstaging.
|
||||
(line 36)
|
||||
* magit-stash: Stashing. (line 8)
|
||||
@@ -3075,8 +3119,8 @@ Appendix D Command Index
|
||||
(line 52)
|
||||
* magit-unstage-file: Staging from File-Visiting Buffers.
|
||||
(line 18)
|
||||
* magit-unstage-file <1>: Minor Mode for Buffers Visiting Files.
|
||||
(line 63)
|
||||
* magit-unstage-file <1>: Commands for Buffers Visiting Files.
|
||||
(line 33)
|
||||
* magit-version: Git Executable. (line 17)
|
||||
* magit-version <1>: Debugging Tools. (line 10)
|
||||
* magit-visit-ref: References Buffer. (line 181)
|
||||
@@ -3168,14 +3212,14 @@ Appendix E Function Index
|
||||
* magit-display-buffer-same-window-except-diff-v1: Switching Buffers.
|
||||
(line 53)
|
||||
* magit-display-buffer-traditional: Switching Buffers. (line 45)
|
||||
* magit-file-checkout: Minor Mode for Buffers Visiting Files.
|
||||
(line 165)
|
||||
* magit-file-delete: Minor Mode for Buffers Visiting Files.
|
||||
(line 157)
|
||||
* magit-file-rename: Minor Mode for Buffers Visiting Files.
|
||||
(line 153)
|
||||
* magit-file-untrack: Minor Mode for Buffers Visiting Files.
|
||||
(line 161)
|
||||
* magit-file-checkout: Commands for Buffers Visiting Files.
|
||||
(line 135)
|
||||
* magit-file-delete: Commands for Buffers Visiting Files.
|
||||
(line 127)
|
||||
* magit-file-rename: Commands for Buffers Visiting Files.
|
||||
(line 123)
|
||||
* magit-file-untrack: Commands for Buffers Visiting Files.
|
||||
(line 131)
|
||||
* magit-find-file: General-Purpose Visit Commands.
|
||||
(line 9)
|
||||
* magit-find-file-other-frame: General-Purpose Visit Commands.
|
||||
@@ -3255,7 +3299,6 @@ Appendix E Function Index
|
||||
* magit-insert-stashes: Status Sections. (line 67)
|
||||
* magit-insert-status-headers: Status Header Sections.
|
||||
(line 12)
|
||||
* magit-insert-submodules: Listing Submodules. (line 35)
|
||||
* magit-insert-tags: References Sections. (line 25)
|
||||
* magit-insert-tags-header: Status Header Sections.
|
||||
(line 56)
|
||||
@@ -3283,7 +3326,7 @@ Appendix E Function Index
|
||||
* magit-mode-quit-window: Quitting Windows. (line 34)
|
||||
* magit-mode-setup: Refreshing Buffers. (line 17)
|
||||
* magit-push-implicitly: Pushing. (line 74)
|
||||
* magit-push-to-remote: Pushing. (line 85)
|
||||
* magit-push-to-remote: Pushing. (line 92)
|
||||
* magit-region-sections: Section Selection. (line 10)
|
||||
* magit-region-values: Section Selection. (line 37)
|
||||
* magit-repolist-column-branch: Repository List. (line 44)
|
||||
@@ -3399,21 +3442,19 @@ Appendix F Variable Index
|
||||
(line 103)
|
||||
* global-auto-revert-mode: Automatic Reverting of File-Visiting Buffers.
|
||||
(line 22)
|
||||
* global-magit-file-mode: Minor Mode for Buffers Visiting Files.
|
||||
(line 13)
|
||||
* magit-auto-revert-immediately: Automatic Reverting of File-Visiting Buffers.
|
||||
(line 32)
|
||||
* magit-auto-revert-mode: Automatic Reverting of File-Visiting Buffers.
|
||||
(line 17)
|
||||
* magit-auto-revert-tracked-only: Automatic Reverting of File-Visiting Buffers.
|
||||
(line 55)
|
||||
* magit-bisect-show-graph: Bisecting. (line 55)
|
||||
* magit-blame-disable-modes: Blaming. (line 168)
|
||||
* magit-blame-echo-style: Blaming. (line 151)
|
||||
* magit-blame-goto-chunk-hook: Blaming. (line 174)
|
||||
* magit-blame-read-only: Blaming. (line 163)
|
||||
* magit-blame-styles: Blaming. (line 146)
|
||||
* magit-blame-time-format: Blaming. (line 158)
|
||||
* magit-bisect-show-graph: Bisecting. (line 65)
|
||||
* magit-blame-disable-modes: Blaming. (line 165)
|
||||
* magit-blame-echo-style: Blaming. (line 148)
|
||||
* magit-blame-goto-chunk-hook: Blaming. (line 171)
|
||||
* magit-blame-read-only: Blaming. (line 160)
|
||||
* magit-blame-styles: Blaming. (line 143)
|
||||
* magit-blame-time-format: Blaming. (line 155)
|
||||
* magit-branch-adjust-remote-upstream-alist: Branch Commands. (line 210)
|
||||
* magit-branch-direct-configure: Branch Commands. (line 20)
|
||||
* magit-branch-prefer-remote-upstream: Branch Commands. (line 165)
|
||||
@@ -3433,9 +3474,10 @@ Appendix F Variable Index
|
||||
* magit-commit-squash-confirm: Initiating a Commit. (line 88)
|
||||
* magit-completing-read-function: Support for Completion Frameworks.
|
||||
(line 27)
|
||||
* magit-define-global-key-bindings: Default Bindings. (line 6)
|
||||
* magit-diff-adjust-tab-width: Diff Options. (line 21)
|
||||
* magit-diff-buffer-file-locked: Minor Mode for Buffers Visiting Files.
|
||||
(line 91)
|
||||
* magit-diff-buffer-file-locked: Commands for Buffers Visiting Files.
|
||||
(line 61)
|
||||
* magit-diff-hide-trailing-cr-characters: Diff Options. (line 90)
|
||||
* magit-diff-highlight-hunk-region-functions: Diff Options. (line 94)
|
||||
* magit-diff-highlight-indentation: Diff Options. (line 75)
|
||||
@@ -3456,8 +3498,6 @@ Appendix F Variable Index
|
||||
* magit-ediff-dwim-show-on-hunks: Ediffing. (line 73)
|
||||
* magit-ediff-quit-hook: Ediffing. (line 88)
|
||||
* magit-ediff-show-stash-with-index: Ediffing. (line 81)
|
||||
* magit-file-mode-map: Minor Mode for Buffers Visiting Files.
|
||||
(line 20)
|
||||
* magit-generate-buffer-name-function: Naming Buffers. (line 6)
|
||||
* magit-git-debug: Viewing Git Output. (line 28)
|
||||
* magit-git-debug <1>: Getting a Value from Git.
|
||||
@@ -3469,8 +3509,8 @@ Appendix F Variable Index
|
||||
* magit-list-refs-sortby: Additional Completion Options.
|
||||
(line 6)
|
||||
* magit-log-auto-more: Log Buffer. (line 69)
|
||||
* magit-log-buffer-file-locked: Minor Mode for Buffers Visiting Files.
|
||||
(line 118)
|
||||
* magit-log-buffer-file-locked: Commands for Buffers Visiting Files.
|
||||
(line 88)
|
||||
* magit-log-margin: Log Margin. (line 12)
|
||||
* magit-log-margin-show-committer-date: Log Margin. (line 49)
|
||||
* magit-log-section-commit-count: Status Sections. (line 136)
|
||||
|
||||
Reference in New Issue
Block a user