[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit 1eb183e 3/3: manual: No longer use dissolvable
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/git-commit 1eb183e 3/3: manual: No longer use dissolvable sections |
Date: |
Tue, 7 Dec 2021 18:57:58 -0500 (EST) |
branch: elpa/git-commit
commit 1eb183e7672bf25fa77ea06d97b3d9c502a698ae
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
manual: No longer use dissolvable sections
These sections existed because I am not fully happy with how
`org-cycle' works, which I should deal with by patching that
function or writing a substitute.
---
Documentation/magit-section.org | 3 +--
Documentation/magit.org | 22 ----------------------
2 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/Documentation/magit-section.org b/Documentation/magit-section.org
index ac42a68..6828408 100644
--- a/Documentation/magit-section.org
+++ b/Documentation/magit-section.org
@@ -249,7 +249,7 @@ source for suitable examples before asking me for help.
Thanks!
matches if no other CONDITION match, even if there is no section
at point.
-* _ Copying
+* Copying
:PROPERTIES:
:COPYING: t
:END:
@@ -278,7 +278,6 @@ General Public License for more details.
# eval: (require 'magit-utils nil t)
# eval: (require 'ol-man nil t)
# eval: (require 'ox-texinfo+ nil t)
-# org-texinfo+-dissolve-noexport-headlines: t
# indent-tabs-mode: nil
# org-src-preserve-indentation: nil
# End:
diff --git a/Documentation/magit.org b/Documentation/magit.org
index 7e87705..a0ee5e1 100644
--- a/Documentation/magit.org
+++ b/Documentation/magit.org
@@ -120,7 +120,6 @@ porcelain commands: ~add~, ~am~, ~bisect~, ~blame~,
~branch~, ~checkout~, ~cherr
commands are implemented on top of Git plumbing commands.
* Installation
-** _
Magit can be installed using Emacs' package manager or manually from
its development repository.
@@ -379,7 +378,6 @@ then it is highly recommended that you read the next
section too.
* Interface Concepts
** Modes and Buffers
-*** _
Magit provides several major-modes. For each of these modes there
usually exists only one buffer per repository. Separate modes and
@@ -873,7 +871,6 @@ buffer) and you would not be asked whether you want to save
the buffer
(because it isn't modified).
** Sections
-*** _
Magit buffers are organized into nested sections, which can be
collapsed and expanded, similar to how sections are handled in Org
@@ -2008,7 +2005,6 @@ Emacs is searching for ~git~.
used every time Magit runs Git for any purpose.
* Inspecting
-** _
The functionality provided by Magit can be roughly divided into three
groups: inspecting existing data, manipulating existing data or adding
@@ -2027,7 +2023,6 @@ mainly concerned with the porcelain -- Magit's plumbing
layer is
described later.
** Status Buffer
-*** _
While other Magit buffers contain e.g. one particular diff or one
particular log, the status buffer contains the diffs for staged and
@@ -2570,7 +2565,6 @@ The following functions can be added to the above option:
but not its push branch.
** Logging
-*** _
The status buffer contains logs for the unpushed and unpulled commits,
but that obviously isn't enough. The transient prefix command
@@ -2977,7 +2971,6 @@ Also see [[man:git-reflog]]
is shown, then this specifies how much space is used to do so.
** Diffing
-*** _
The status buffer contains diffs for the staged and unstaged commits,
but that obviously isn't enough. The transient prefix command
@@ -3498,7 +3491,6 @@ information on how to use Ediff itself, see info:ediff.
that were created using a Magit command.
** References Buffer
-*** _
- Key: y, magit-show-refs
@@ -4231,7 +4223,6 @@ The following suffixes are disabled by default. See
including the name of the owner.
** Staging and Unstaging
-*** _
Like Git, Magit can of course stage and unstage complete files.
Unlike Git, it also allows users to gracefully un-/stage
@@ -4392,7 +4383,6 @@ With a prefix argument all apply variants attempt a 3-way
merge when
appropriate (i.e. when ~git apply~ is used internally).
** Committing
-*** _
When the user initiates a commit, Magit calls ~git commit~ without any
arguments, so Git has to get it from the user. It creates the file
@@ -5530,7 +5520,6 @@ former. It is much easier to understand and use, and
except for
truly complex conflicts, the latter is usually overkill.
** Rebasing
-*** _
Also see [[man:git-rebase]] For information on how to resolve
conflicts that occur during rebases see the preceding section.
@@ -5960,7 +5949,6 @@ calculating this hash. The patch-ids of two commits can
be used to
answer the question "Do these commits make the same change?".
** Cherry Picking
-*** _
Also see [[man:git-cherry-pick]]
@@ -6813,7 +6801,6 @@ values are displayed and can be modified.
~refs/notes/~ namespace (or ~**~ if some names contain slashes).
** Submodules
-*** _
Also see [[man:git-submodule]]
@@ -7065,7 +7052,6 @@ Therefore when the region is active, then both of these
commands
behave like ~kill-ring-save~ instead of as described above.
** Wip Modes
-*** _
Git keeps *committed* changes around long enough for users to recover
changes they have accidentally deleted. It does so by not garbage
@@ -7460,7 +7446,6 @@ bindings, but this might be extended.
Kill the current buffer.
* Customizing
-** _
Both Git and Emacs are highly customizable. Magit is both a Git
porcelain as well as an Emacs package, so it makes sense to customize
@@ -7559,7 +7544,6 @@ For example:
#+END_SRC
** Essential Settings
-*** _
The next two sections list and discuss several variables that many
users might want to customize, for safety and/or performance reasons.
@@ -7598,7 +7582,6 @@ but to make an informed decision you should see [[*Risk
of Reverting
Automatically]].
*** Performance
-**** _
After Magit has run ~git~ for side-effects, it also refreshes the
current Magit buffer and the respective status buffer. This is
@@ -7855,7 +7838,6 @@ for more information.
Binding Conventions]].
* Plumbing
-** _
The following sections describe how to use several of Magit's core
abstractions to extend Magit itself or implement a separate extension.
@@ -7870,7 +7852,6 @@ command provided by your own Magit extension, then
checkout
https://github.com/magit/magit/wiki/Plugin-Dispatch-Key-Registry.
** Calling Git
-*** _
Magit provides many specialized functions for calling Git. All of
these functions are defined in either ~magit-git.el~ or ~magit-process.el~
@@ -8440,7 +8421,6 @@ where ~*~ may be something like ~diff~) with the value of
of this variable and then calling this ~magit-refresh-function~.
** Conventions
-*** _
Also see [[*Completion and Confirmation]].
@@ -8586,7 +8566,6 @@ all.
:PROPERTIES:
:APPENDIX: t
:END:
-** _
The next two nodes lists frequently asked questions. For a list of
frequently *and recently* asked questions, i.e. questions that haven't
@@ -9038,7 +9017,6 @@ General Public License for more details.
# eval: (require 'magit-utils nil t)
# eval: (require 'ol-man nil t)
# eval: (require 'ox-texinfo+ nil t)
-# org-texinfo+-dissolve-noexport-headlines: t
# indent-tabs-mode: nil
# org-src-preserve-indentation: nil
# End: