branch: elpa/git-commit commit b4194014190026687af4b600ab885d5f45bf99ba Author: Jonas Bernoulli <jo...@bernoul.li> Commit: Jonas Bernoulli <jo...@bernoul.li>
manual: No longer depend on the ox-extra package Instead of ox-extra's "ignored sections" use ox-texinfo+'s new "dissolvable headlines". --- Documentation/Makefile | 5 ++--- Documentation/magit-section.org | 5 +---- Documentation/magit.org | 49 +++++++++++++++++++---------------------- 3 files changed, 26 insertions(+), 33 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 0940459..85aa887 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -83,10 +83,9 @@ clean: ## Release management ################################################ -ORG_ARGS = --batch -Q $(ORG_LOAD_PATH) -ORG_ARGS += -l magit-utils.el -l ox-extra -l ox-texinfo+.el +ORG_ARGS = --batch -Q $(ORG_LOAD_PATH) -l magit-utils.el -l ox-texinfo+.el ORG_ARGS += --eval "(or (require 'org-man nil t) (require 'ol-man))" -ORG_EVAL = --eval "(ox-extras-activate '(ignore-headlines))" +ORG_EVAL = --eval "(setq org-texinfo+-dissolve-noexport-headlines t)" ORG_EVAL += --eval "(setq indent-tabs-mode nil)" ORG_EVAL += --eval "(setq org-src-preserve-indentation nil)" ORG_EVAL += --funcall org-texinfo-export-to-texinfo diff --git a/Documentation/magit-section.org b/Documentation/magit-section.org index c382f36..70447e0 100644 --- a/Documentation/magit-section.org +++ b/Documentation/magit-section.org @@ -268,8 +268,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. #+END_QUOTE -* _ :ignore: - # LocalWords: ARGS CONDITIONs EVAL Git Git's IDENT # LocalWords: LocalWords MERCHANTABILITY Magit Makefile # LocalWords: alist eval featurep ident keymap magit ol @@ -280,9 +278,8 @@ General Public License for more details. # eval: (require 'magit-utils nil t) # eval: (require 'org-man nil t) # eval: (require 'ol-man nil t) -# eval: (require 'ox-extra nil t) # eval: (require 'ox-texinfo+ nil t) -# eval: (and (featurep 'ox-extra) (ox-extras-activate '(ignore-headlines))) +# 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 4c55e11..0883224 100644 --- a/Documentation/magit.org +++ b/Documentation/magit.org @@ -120,7 +120,7 @@ porcelain commands: ~add~, ~am~, ~bisect~, ~blame~, ~branch~, ~checkout~, ~cherr commands are implemented on top of Git plumbing commands. * Installation -** _ :ignore: +** _ Magit can be installed using Emacs' package manager or manually from its development repository. @@ -379,7 +379,7 @@ then it is highly recommended that you read the next section too. * Interface Concepts ** Modes and Buffers -*** _ :ignore: +*** _ Magit provides several major-modes. For each of these modes there usually exists only one buffer per repository. Separate modes and @@ -873,7 +873,7 @@ buffer) and you would not be asked whether you want to save the buffer (because it isn't modified). ** Sections -*** _ :ignore: +*** _ Magit buffers are organized into nested sections, which can be collapsed and expanded, similar to how sections are handled in Org @@ -2008,7 +2008,7 @@ Emacs is searching for ~git~. used every time Magit runs Git for any purpose. * Inspecting -** _ :ignore: +** _ The functionality provided by Magit can be roughly divided into three groups: inspecting existing data, manipulating existing data or adding @@ -2027,7 +2027,7 @@ mainly concerned with the porcelain -- Magit's plumbing layer is described later. ** Status Buffer -*** _ :ignore: +*** _ 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 +2570,7 @@ The following functions can be added to the above option: but not its push branch. ** Logging -*** _ :ignore: +*** _ The status buffer contains logs for the unpushed and unpulled commits, but that obviously isn't enough. The transient prefix command @@ -2977,7 +2977,7 @@ Also see [[man:git-reflog]] is shown, then this specifies how much space is used to do so. ** Diffing -*** _ :ignore: +*** _ The status buffer contains diffs for the staged and unstaged commits, but that obviously isn't enough. The transient prefix command @@ -3498,7 +3498,7 @@ information on how to use Ediff itself, see info:ediff. that were created using a Magit command. ** References Buffer -*** _ :ignore: +*** _ - Key: y, magit-show-refs @@ -4231,7 +4231,7 @@ The following suffixes are disabled by default. See including the name of the owner. ** Staging and Unstaging -*** _ :ignore: +*** _ Like Git, Magit can of course stage and unstage complete files. Unlike Git, it also allows users to gracefully un-/stage @@ -4392,7 +4392,7 @@ With a prefix argument all apply variants attempt a 3-way merge when appropriate (i.e. when ~git apply~ is used internally). ** Committing -*** _ :ignore: +*** _ 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 +5530,7 @@ former. It is much easier to understand and use, and except for truly complex conflicts, the latter is usually overkill. ** Rebasing -*** _ :ignore: +*** _ Also see [[man:git-rebase]] For information on how to resolve conflicts that occur during rebases see the preceding section. @@ -5960,7 +5960,7 @@ 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 -*** _ :ignore: +*** _ Also see [[man:git-cherry-pick]] @@ -6812,7 +6812,7 @@ values are displayed and can be modified. ~refs/notes/~ namespace (or ~**~ if some names contain slashes). ** Submodules -*** _ :ignore: +*** _ Also see [[man:git-submodule]] @@ -7064,7 +7064,7 @@ Therefore when the region is active, then both of these commands behave like ~kill-ring-save~ instead of as described above. ** Wip Modes -*** _ :ignore: +*** _ Git keeps *committed* changes around long enough for users to recover changes they have accidentally deleted. It does so by not garbage @@ -7459,7 +7459,7 @@ bindings, but this might be extended. Kill the current buffer. * Customizing -** _ :ignore: +** _ 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 @@ -7558,7 +7558,7 @@ For example: #+END_SRC ** Essential Settings -*** _ :ignore: +*** _ The next two sections list and discuss several variables that many users might want to customize, for safety and/or performance reasons. @@ -7597,7 +7597,7 @@ but to make an informed decision you should see [[*Risk of Reverting Automatically]]. *** Performance -**** _ :ignore: +**** _ After Magit has run ~git~ for side-effects, it also refreshes the current Magit buffer and the respective status buffer. This is @@ -7854,7 +7854,7 @@ for more information. Binding Conventions]]. * Plumbing -** _ :ignore: +** _ The following sections describe how to use several of Magit's core abstractions to extend Magit itself or implement a separate extension. @@ -7869,7 +7869,7 @@ command provided by your own Magit extension, then checkout https://github.com/magit/magit/wiki/Plugin-Dispatch-Key-Registry. ** Calling Git -*** _ :ignore: +*** _ Magit provides many specialized functions for calling Git. All of these functions are defined in either ~magit-git.el~ or ~magit-process.el~ @@ -8439,7 +8439,7 @@ where ~*~ may be something like ~diff~) with the value of of this variable and then calling this ~magit-refresh-function~. ** Conventions -*** _ :ignore: +*** _ Also see [[*Completion and Confirmation]]. @@ -8585,7 +8585,7 @@ all. :PROPERTIES: :APPENDIX: t :END: -** _ :ignore: +** _ The next two nodes lists frequently asked questions. For a list of frequently *and recently* asked questions, i.e. questions that haven't @@ -8993,7 +8993,7 @@ Please also see the [[*FAQ]]. :INDEX: vr :END: -* _ Copying +* Copying :PROPERTIES: :COPYING: t :END: @@ -9012,8 +9012,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. #+END_QUOTE -* _ :ignore: - # LocalWords: ARG ARGS CONDITIONs ChangeLog DNS Dired Ediff Ediffing # LocalWords: Elpa Emacsclient FUNC Flyspell Git Git's Gitk HOOK's # LocalWords: IDENT Ido Junio LocalWords Magit Magit's Magitian Magitians @@ -9039,9 +9037,8 @@ General Public License for more details. # eval: (require 'magit-utils nil t) # eval: (require 'org-man nil t) # eval: (require 'ol-man nil t) -# eval: (require 'ox-extra nil t) # eval: (require 'ox-texinfo+ nil t) -# eval: (and (featurep 'ox-extra) (ox-extras-activate '(ignore-headlines))) +# org-texinfo+-dissolve-noexport-headlines: t # indent-tabs-mode: nil # org-src-preserve-indentation: nil # End: