daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

update packages

Browse Source
This commit is contained in:
Daniel Weschke
2021-01-08 19:32:30 +01:00
parent ce8f24d28a
commit f5649dceab
467 changed files with 26642 additions and 22487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
lisp/magit/magit.info-1
View File

@@ -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
@@ -31,9 +31,9 @@ to perform almost all of their daily version control tasks directly from
within Emacs. While many fine Git clients exist, only Magit and Git
itself deserve to be called porcelains.
This manual is for Magit version 2.90.1 (v2.90.1-996-g6b88fab39+1).
This manual is for Magit version 2.90.1 (v2.90.1-1138-gd583ea35d+1).
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
@@ -237,7 +237,7 @@ Miscellaneous
* Worktree::
* Common Commands::
* Wip Modes::
* Minor Mode for Buffers Visiting Files::
* Commands for Buffers Visiting Files::
* Minor Mode for Buffers Visiting Blobs::
Submodules
@@ -261,6 +261,7 @@ Essential Settings
* Safety::
* Performance::
* Default Bindings::
Plumbing
@@ -295,6 +296,7 @@ FAQ
FAQ - How to ...?
* 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?::
@@ -480,10 +482,10 @@ Melpa or at ‘/path/to/magit/../<package>’, then you have to tell ‘make’
where to find them. To do so create the file ‘/path/to/magit/config.mk’
with the following content before running ‘make’:
LOAD_PATH = -L /path/to/magit/lisp
LOAD_PATH += -L /path/to/dash
LOAD_PATH += -L /path/to/transient
LOAD_PATH += -L /path/to/with-editor
LOAD_PATH = -L ~/.emacs.d/site-lisp/magit/lisp
LOAD_PATH += -L ~/.emacs.d/site-lisp/dash
LOAD_PATH += -L ~/.emacs.d/site-lisp/transient/lisp
LOAD_PATH += -L ~/.emacs.d/site-lisp/with-editor
Finally add this to your init file:
@@ -495,6 +497,13 @@ with the following content before running ‘make’:
(add-to-list 'Info-directory-list
"~/.emacs.d/site-lisp/magit/Documentation/"))
Of course if you installed the dependencies manually as well, then
you have to tell Emacs about them too, by prefixing the above with:
(add-to-list 'load-path "~/.emacs.d/site-lisp/dash")
(add-to-list 'load-path "~/.emacs.d/site-lisp/transient/lisp")
(add-to-list 'load-path "~/.emacs.d/site-lisp/with-editor")
Note that you have to add the ‘lisp’ subdirectory to the ‘load-path’,
not the top-level of the repository, and that elements of ‘load-path’
should not end with a slash, while those of ‘Info-directory-list’
@@ -569,11 +578,8 @@ tutorial. Alternatively you can use an existing local repository, but
if you do that, then you should commit all uncommitted changes before
proceeding.
To display information about the current Git repository, type ‘M-x
magit-status RET’. You will be using this command a lot, and should
therefore give it a global key binding. This is what we recommend:
(global-set-key (kbd "C-x g") 'magit-status)
Type ‘C-x g’ to display information about the current Git repository
in a dedicated buffer, called the status buffer.
Most Magit commands are commonly invoked from the status buffer. It
can be considered the primary interface for interacting with Git using
@@ -624,7 +630,7 @@ that invokes/sets it. Do not worry about this for now. We want to
create a "normal" commit, which is done by typing ‘c’ again.
Now two new buffers appear. One is for writing the commit message,
the other shows a diff with the changes that you are about to committed.
the other shows a diff with the changes that you are about to commit.
Write a message and then type ‘C-c C-c’ to actually create the commit.
You probably don’t want to push the commit you just created because
@@ -635,27 +641,24 @@ local branch onto the remote configured as the push-remote. (If the
push-remote is not configured yet, then you would first be prompted for
the remote to push to.)
So far we have mentioned the commit, push, and log transient prefix
commands. These are probably among the transients you will be using the
most, but many others exist. To show a transient that lists all other
transients (as well as the various apply commands and some other
essential commands), type ‘h’. Try a few.
So far we have mentioned the commit, push, and log menu commands.
These are probably among the menus you will be using the most, but many
others exist. To show a menu that lists all other menus (as well as the
various apply commands and some other essential commands), type ‘h’.
Try a few. (Such menus are also called "transient prefix commands" or
just "transients".)
The key bindings in that transient correspond to the bindings in
Magit buffers, including but not limited to the status buffer. So you
could type ‘h d’ to bring up the diff transient, but once you remember
that "d" stands for "diff", you would usually do so by just typing ‘d’.
But this "prefix of prefixes" is useful even once you have memorized all
the bindings, as it can provide easy access to Magit commands from
non-Magit buffers. You should create a global key binding for this
command too:
The key bindings in that menu correspond to the bindings in Magit
buffers, including but not limited to the status buffer. So you could
type ‘h d’ to bring up the diff menu, but once you remember that "d"
stands for "diff", you would usually do so by just typing ‘d’. But this
"prefix of prefixes" is useful even once you have memorized all the
bindings, as it can provide easy access to Magit commands from non-Magit
buffers. The global binding is ‘C-x M-g’.
(global-set-key (kbd "C-x M-g") 'magit-dispatch)
In the same vein, you might also want to enable
‘global-magit-file-mode’ to get some more Magit key bindings in regular
file-visiting buffers (see *note Minor Mode for Buffers Visiting
Files::).
In file visiting buffers ‘C-c M-g’ brings up a similar menu featuring
commands that act on just the visited file, see *note Commands for
Buffers Visiting Files::.
It is not necessary that you do so now, but if you stick with Magit,
then it is highly recommended that you read the next section too.
@@ -1905,6 +1908,16 @@ telling Magit to ask fewer questions.
default (or selecting another). This action only
concerns the deletion of multiple stashes at once.
• Publishing:
‘set-and-push’ When pushing to the upstream or the push-remote
and that isn’t actually configured yet, then the user can
first set the target. If s/he confirms the default too
quickly, then s/he might end up pushing to the wrong branch
and if the remote repository is configured to disallow fixing
such mistakes, then that can be quite embarrassing and
annoying.
• Edit published history:
Without adding these symbols here, you will be warned before
@@ -3066,7 +3079,7 @@ Reflog::.
Show log for all references and ‘HEAD’.
Two additional commands that show the log for the file or blob that
is being visited in the current buffer exists, see *note Minor Mode for
is being visited in the current buffer exists, see *note Commands for
Buffers Visiting Files::. The command ‘magit-cherry’ also shows a log,
see *note Cherries::.
@@ -3544,7 +3557,7 @@ another buffer:
Show all diffs of a stash in a buffer.
Two additional commands that show the diff for the file or blob that
is being visited in the current buffer exists, see *note Minor Mode for
is being visited in the current buffer exists, see *note Commands for
Buffers Visiting Files::.
* Menu:
@@ -4336,8 +4349,11 @@ following suffix commands.
Start a bisect session.
Bisecting a bug means to find the commit that introduced it. This
command starts such a bisect session by asking for a known good and
a bad commit.
command starts such a bisect session by asking for a known good
commit and a known bad commit. If you’re bisecting a change that
isn’t a regression, you can select alternate terms that are
conceptually more fitting than "bad" and "good", but the infix
arguments to do so are disabled by default.
‘B s’ (‘magit-bisect-run’)
@@ -4356,6 +4372,13 @@ following suffix commands.
Mark the current commit as good. Use this after you have asserted
that the commit does not contain the bug in question.
‘B m’ (‘magit-bisect-mark’)
Mark the current commit with one of the bisect terms. This command
provides an alternative to ‘magit-bisect-bad’ and
‘magit-bisect-good’ and is useful when using terms other than "bad"
and "good". This suffix is disabled by default.
‘B k’ (‘magit-bisect-skip’)
Skip the current commit. Use this if for some reason the current
@@ -4505,10 +4528,7 @@ File: magit.info, Node: Blaming, Prev: Visiting Files and Blobs, Up: Inspecti
Also see *note (gitman)git-blame::.
To start blaming invoke the ‘magit-file-dispatch’ transient prefix
command by pressing ‘C-c M-g’. (This is only the default binding and
the recommended binding is ‘C-c g’. Also neither binding may be
available if you disabled ‘global-magit-file-mode’. Also see *note
Minor Mode for Buffers Visiting Files::.)
command by pressing ‘C-c M-g’.
The blaming suffix commands can be invoked from the dispatch
transient. However if you want to set an infix argument, then you have
@@ -7314,6 +7334,13 @@ add them to the transient.
‘branch.<branch>.remote’, ‘branch.<branch>.merge’, and
‘remote.<remote>.push’.
If you add this suffix to a transient prefix without explicitly
specifying the description, then an attempt is made to predict what
this command will do. For example:
(transient-insert-suffix 'magit-push \"p\"
'(\"i\" magit-push-implicitly))"
-- Command: magit-push-to-remote remote args
This command pushes to the remote REMOTE without using an explicit
@@ -7427,7 +7454,7 @@ File: magit.info, Node: Miscellaneous, Next: Customizing, Prev: Transferring,
* Worktree::
* Common Commands::
* Wip Modes::
* Minor Mode for Buffers Visiting Files::
* Commands for Buffers Visiting Files::
* Minor Mode for Buffers Visiting Blobs::

@@ -7575,7 +7602,7 @@ File: magit.info, Node: Listing Submodules, Next: Submodule Transient, Up: Su
The command ‘magit-list-submodules’ displays a list of the current
repository’s submodules in a separate buffer. It’s also possible to
display information about submodules directly in the status buffer of
the super-repository by adding ‘magit-insert-submodules’ to the hook
the super-repository by adding ‘magit-insert-modules’ to the hook
‘magit-status-sections-hook’ as described in *note Status Module
Sections::.
@@ -7601,17 +7628,6 @@ Sections::.
It has to return a string to be inserted or nil. PROPS is an alist
that supports the keys ‘:right-align’ and ‘:pad-right’.
-- Function: magit-insert-submodules
Insert sections for all submodules. For each section insert the
path, the branch, and the output of ‘git describe --tags’, or,
failing that, the abbreviated HEAD commit hash.
Press ‘RET’ on such a submodule section to show its own status
buffer. Press ‘RET’ on the "Modules" section to display a list of
submodules in a separate buffer. This shows additional information
not displayed in the super-repository’s status buffer.

File: magit.info, Node: Submodule Transient, Prev: Listing Submodules, Up: Submodules