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

update packages

Browse Source
This commit is contained in:
Daniel Weschke
2026-06-27 11:34:21 +02:00
parent 4be4f859c4
commit 1aaef48596
246 changed files with 7997 additions and 4359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lisp/magit/magit.info
+256 -163
View File
@@ -2173,6 +2173,83 @@ where Emacs is searching for ‘git’.
what you are doing. And think very hard before adding something;
it will be used every time Magit runs Git for any purpose.
4.7.6 Mapping Git Hooks to Lisp Hooks
-------------------------------------
Git hooks can be configured to call Lisp hooks, starting with Git
v2.54.0. The mechanism described here is only used when ‘git’ is
invoked by Magit, and ‘git’ is run asynchronously and on the local
machine.
‘magit-run-hooks-from-githooks’
This option controls whether Git hooks may run Lisp hooks.
Magit only defines one such hook mapping, but users can add more.
‘magit-user-githook-file’
This option controls the location of a user-editable file
containing additional hook mappings.
-- Variable: magit-githook-directory
The value of this variable is the directory containing files Magit
needs to map Git hooks to Lisp hooks.
This directory must contains two files; ‘config’, which maps Git
hooks to the Lisp hook ‘magit-common-git-post-commit-functions’,
and an executable ‘magit-run-git-hook’, which is used in that, and
potentially other, hook mappings.
The value of this variable is set by ‘magit-process-git-arguments’,
when it is first needed. Users can set it to another directory,
but that should rarely be necessary. Additional hook mappings
should instead be defined in ‘magit-user-githook-file’.
-- Function: magit-run-git-hook (hook &rest args)
This function runs the Lisp hook HOOK with the specified arguments
ARGS. ARGS are the arguments (a possibly empty list of strings),
which the Git hook was called with. HOOK is a string naming a
hook.
This function is only intended to be called via ‘emacsclient’, by
an executable by the same name, which in turn is only intended to
be called by Git hooks.
-- Variable: magit-common-git-post-commit-functions
This Lisp hook is run by the Git hooks ‘post-commit’, ‘post-merge’
and ‘post-rewrite’. There is not a single Git hook, which is
called after a commit is created; to achieve that, all of these
hooks have to be used.
Git hooks are documented in *note (gitman)githooks::. Also see *note
(gitman)git-hook::. Using ‘magit-common-git-post-commit-functions’ as
an example, the following is how Magit gets Git to map Git hooks to Lisp
hooks.
Iff Magit calls Git asynchronously and on the local machine, it
injects the global arguments ‘-c include.path=/path/to/githooks/config’.
That file contains:
[hook "magit-common-post-commit"]
event = post-commit
event = post-merge
event = post-rewrite
command = magit-run-git-hook magit-common-git-post-commit-functions
Consequently when one of the Git hooks ‘post-commit’, ‘post-merge’ or
‘post-rewrite’ is triggered, that causes the ‘magit-run-git-hook’
executable to be called with ‘magit-common-git-post-commit-functions’ as
the first argument.
That executable used the ‘emacsclient’ to call a Lisp function by the
same name, which takes the name of a Lisp hook as the first argument.
The executable may receive additional arguments from the Git hook, which
it passes on to the function. All arguments are strings.
The function ‘magit-run-git-hook’ runs the Lisp hook using
‘run-hook-with-args’, passing along all arguments, starting with the
second. It also arranges for ‘message’ to output to standard output, so
that messages appear in Magit's process buffer.

File: magit.info, Node: Inspecting, Next: Manipulating, Prev: Interface Concepts, Up: Top
@@ -5512,6 +5589,9 @@ them. Those features are available from separate transient commands.
the name of the branch that is to be created. The default is ‘t’,
and I recommend you leave it at that.
-- User Option: magit-branch-name-suggestions
List of names and/or prefixes suggested when naming a new branch.
-- User Option: magit-branch-prefer-remote-upstream
This option specifies whether remote upstreams are favored over
local upstreams when creating new branches.
@@ -7734,18 +7814,14 @@ files are being committed.
This option controls whether the current branch is merged into the
wip refs after a new commit was created on the branch.
If non-‘nil’ and the current branch has new commits, then it is
merged into the wip ref before creating a new wip commit. This
makes it easier to inspect wip history and the wip commits are
never garbage collected.
If ‘nil’ and the current branch has new commits, then the wip ref
is reset to the tip of the branch before creating a new wip commit.
With this setting wip commits are eventually garbage collected.
If ‘immediately’, then use ‘git-commit-post-finish-hook’ to create
the merge commit. This is discouraged because it can lead to a
race condition, e.g., during rebases.
If non-‘nil’ and the current branch has new commits, then it is
merged into the wip ref before creating a new wip commit. This
makes it easier to inspect wip history and the wip commits are
never garbage collected.
When ‘magit-wip-merge-branch’ is ‘t’, then the history looks like
this:
@@ -9230,6 +9306,15 @@ being enabled.
If you choose to disable VC anyway, then you can do so by changing
the value of ‘vc-handled-backends’.
A.1.7 The diff/log is filtered to one file; how do I show all changes.
----------------------------------------------------------------------
The diff arguments used in the current buffer can be changed using the
‘magit-diff-refresh’ menu on ‘D’.
The log arguments used in the current buffer can be changed using the
‘magit-log-refresh’ menu on ‘L’.

File: magit.info, Node: FAQ - Issues and Errors, Prev: FAQ - How to ...?, Up: FAQ
@@ -9899,6 +9984,8 @@ Appendix C Keystroke Index
* M-p <2>: Rebasing. (line 158)
* M-w: Blaming. (line 134)
* M-w <1>: Common Commands. (line 39)
* magit-run-hooks-from-githooks: Running Git. (line 223)
* magit-user-githook-file: Running Git. (line 228)
* MM: Rebasing. (line 248)
* Mt: Rebasing. (line 254)
* n: Sections. (line 38)
@@ -10178,14 +10265,14 @@ Appendix D Function and Command Index
* magit-branch-configure: Branching. (line 81)
* magit-branch-create: Branching. (line 104)
* magit-branch-delete: Branching. (line 188)
* magit-branch-or-checkout: Branching. (line 307)
* magit-branch-orphan: Branching. (line 303)
* magit-branch-or-checkout: Branching. (line 310)
* magit-branch-orphan: Branching. (line 306)
* magit-branch-rename: Branching. (line 199)
* magit-branch-reset: Branching. (line 173)
* magit-branch-shelve: Branching. (line 447)
* magit-branch-shelve: Branching. (line 450)
* magit-branch-spinoff: Branching. (line 141)
* magit-branch-spinout: Branching. (line 168)
* magit-branch-unshelve: Branching. (line 457)
* magit-branch-unshelve: Branching. (line 460)
* magit-builtin-completing-read: Completion Confirmation and the Selection.
(line 354)
* magit-bundle: Bundle. (line 8)
@@ -10608,6 +10695,7 @@ Appendix D Function and Command Index
* magit-run-git: Calling Git. (line 144)
* magit-run-git-async: Calling Git. (line 169)
* magit-run-git-gui: Running Git. (line 131)
* magit-run-git-hook: Running Git. (line 245)
* magit-run-git-with-editor: Calling Git. (line 181)
* magit-run-git-with-input: Calling Git. (line 147)
* magit-run-gitk: Running Git. (line 122)
@@ -10783,13 +10871,13 @@ Appendix E Variable Index
* auto-revert-stop-on-user-input: Modes and Buffers. (line 388)
* auto-revert-use-notify: Modes and Buffers. (line 369)
* auto-revert-verbose: Modes and Buffers. (line 417)
* branch.autoSetupMerge: Branching. (line 394)
* branch.autoSetupRebase: Branching. (line 408)
* branch.NAME.description: Branching. (line 365)
* branch.NAME.merge: Branching. (line 333)
* branch.NAME.pushRemote: Branching. (line 352)
* branch.NAME.rebase: Branching. (line 343)
* branch.NAME.remote: Branching. (line 338)
* branch.autoSetupMerge: Branching. (line 397)
* branch.autoSetupRebase: Branching. (line 411)
* branch.NAME.description: Branching. (line 368)
* branch.NAME.merge: Branching. (line 336)
* branch.NAME.pushRemote: Branching. (line 355)
* branch.NAME.rebase: Branching. (line 346)
* branch.NAME.remote: Branching. (line 341)
* core.notesRef: Notes. (line 53)
* git-commit-finish-query-functions: Committing. (line 518)
* git-commit-known-pseudo-headers: Committing. (line 408)
@@ -10812,9 +10900,10 @@ Appendix E Variable Index
* magit-blame-read-only: Blaming. (line 161)
* magit-blame-styles: Blaming. (line 147)
* magit-blame-time-format: Blaming. (line 157)
* magit-branch-adjust-remote-upstream-alist: Branching. (line 252)
* magit-branch-adjust-remote-upstream-alist: Branching. (line 255)
* magit-branch-direct-configure: Branching. (line 69)
* magit-branch-prefer-remote-upstream: Branching. (line 208)
* magit-branch-name-suggestions: Branching. (line 208)
* magit-branch-prefer-remote-upstream: Branching. (line 211)
* magit-branch-read-upstream-first: Branching. (line 203)
* magit-buffer-name-format: Modes and Buffers. (line 150)
* magit-bury-buffer-function: Modes and Buffers. (line 215)
@@ -10831,6 +10920,7 @@ Appendix E Variable Index
* magit-commit-reword-override-date: Committing. (line 284)
* magit-commit-show-diff: Committing. (line 221)
* magit-commit-squash-confirm: Committing. (line 269)
* magit-common-git-post-commit-functions: Running Git. (line 255)
* magit-completing-read-function: Completion Confirmation and the Selection.
(line 340)
* magit-define-global-key-bindings: Essential Settings. (line 239)
@@ -10869,6 +10959,7 @@ Appendix E Variable Index
* magit-git-debug: Calling Git. (line 95)
* magit-git-executable: Running Git. (line 162)
* magit-git-global-arguments: Running Git. (line 202)
* magit-githook-directory: Running Git. (line 231)
* magit-keep-region-overlay: Completion Confirmation and the Selection.
(line 294)
* magit-list-refs-sortby: Completion Confirmation and the Selection.
@@ -10893,7 +10984,7 @@ Appendix E Variable Index
* magit-post-commit-hook: Committing. (line 229)
* magit-post-display-buffer-hook: Modes and Buffers. (line 117)
* magit-pre-display-buffer-hook: Modes and Buffers. (line 108)
* magit-prefer-remote-upstream: Branching. (line 431)
* magit-prefer-remote-upstream: Branching. (line 434)
* magit-prefix-use-buffer-arguments: Transient Arguments and Buffer Variables.
(line 65)
* magit-process-raise-error: Calling Git. (line 235)
@@ -10948,14 +11039,14 @@ Appendix E Variable Index
* magit-wip-mode-lighter: Wip Modes. (line 93)
* magit-wip-namespace: Wip Modes. (line 86)
* notes.displayRef: Notes. (line 57)
* pull.rebase: Branching. (line 373)
* pull.rebase: Branching. (line 376)
* remote.NAME.fetch: Remotes. (line 108)
* remote.NAME.followRemoteHEAD: Remotes. (line 128)
* remote.NAME.push: Remotes. (line 117)
* remote.NAME.pushurl: Remotes. (line 112)
* remote.NAME.tagOpts: Remotes. (line 121)
* remote.NAME.url: Remotes. (line 104)
* remote.pushDefault: Branching. (line 385)
* remote.pushDefault: Branching. (line 388)

Tag Table:
@@ -10997,145 +11088,147 @@ Ref: Git Process Status90163
Ref: Running Git Manually91261
Ref: Git Executable93834
Ref: Global Git Arguments96721
Node: Inspecting97436
Node: Status Buffer98583
Ref: Status Sections102707
Ref: Status File List Sections106169
Ref: Status Log Sections108739
Ref: Status Header Sections110089
Ref: Status Module Sections112580
Ref: Status Options114954
Node: Repository List116229
Node: Logging121016
Ref: Refreshing Logs123747
Ref: Log Buffer125091
Ref: Log Margin129808
Ref: Select from Log132871
Ref: Reflog134993
Ref: Cherries136546
Node: Diffing138322
Ref: Refreshing Diffs142267
Ref: Commands Available in Diffs147545
Ref: Diff Options149940
Ref: Revision Buffer157441
Node: Ediffing160695
Node: References Buffer166739
Ref: References Sections177302
Node: Bisecting178087
Node: Visiting Files and Blobs180394
Ref: General-Purpose Visit Commands180836
Ref: Visiting Files and Blobs from a Diff181654
Node: Blaming186902
Node: Manipulating193880
Node: Creating Repository194222
Node: Cloning Repository194759
Node: Staging and Unstaging201198
Ref: Staging from File-Visiting Buffers205126
Node: Applying206141
Node: Committing208214
Ref: Initiating a Commit208839
Ref: Creating a new commit209151
Ref: Editing the last commit209261
Ref: Editing any reachable commit211240
Ref: Editing any reachable commit and rebasing immediately215653
Ref: Options used by commit commands217301
Ref: Used by all or most commit commands217373
Ref: Used by all squash and fixup commands219602
Ref: Used by specific commit commands220156
Ref: Editing Commit Messages220480
Ref: Using the Revision Stack223034
Ref: Commit Pseudo Headers225994
Ref: Commit Mode and Hooks227146
Ref: Commit Message Conventions229855
Node: Branching231743
Ref: The Two Remotes231864
Ref: Branch Commands234429
Ref: Branch Git Variables247167
Ref: Auxiliary Branch Commands252412
Node: Merging253429
Node: Resolving Conflicts257778
Node: Rebasing263148
Ref: Editing Rebase Sequences268345
Ref: Information About In-Progress Rebase273574
Ref: Rebasing-Footnote-1282566
Node: Cherry Picking283162
Ref: Reverting287470
Node: Resetting288830
Node: Stashing290654
Node: Transferring296893
Node: Remotes297115
Ref: Remote Commands297212
Ref: Remote Git Variables301156
Node: Fetching303089
Node: Pulling305572
Node: Pushing306598
Node: Plain Patches310885
Node: Maildir Patches312356
Node: Miscellaneous313835
Node: Tagging314181
Node: Notes316074
Node: Submodules318409
Ref: Listing Submodules318570
Ref: Submodule Transient320631
Node: Subtree322984
Node: Worktree324915
Node: Sparse checkouts326230
Node: Bundle329002
Node: Common Commands329377
Node: Wip Modes332003
Ref: Wip Graph336577
Node: Commands for Buffers Visiting Files339016
Node: Minor Mode for Buffers Visiting Blobs347331
Node: Customizing348494
Node: Per-Repository Configuration350086
Node: Essential Settings352340
Ref: Safety352629
Ref: Performance354304
Ref: Log Performance357095
Ref: Diff Performance358394
Ref: Refs Buffer Performance359735
Ref: Committing Performance360308
Ref: Microsoft Windows Performance361288
Ref: MacOS Performance362375
Ref: Global Bindings363258
Ref: Essential Settings-Footnote-1365431
Node: Plumbing365513
Node: Calling Git366338
Ref: Getting a Value from Git367797
Ref: Calling Git for Effect371415
Node: Section Plumbing377354
Ref: Creating Sections377506
Ref: Section Selection381316
Ref: Matching Sections383013
Node: Refreshing Buffers388915
Node: Conventions392055
Ref: Theming Faces392219
Node: FAQ400252
Node: FAQ - How to ...?400688
Ref: How to pronounce Magit?400821
Ref: How to show git's output?401513
Ref: How to install the gitman info manual?402130
Ref: How to show diffs for gpg-encrypted files?402935
Ref: How does branching and pushing work?403344
Ref: Should I disable VC?403508
Node: FAQ - Issues and Errors403991
Ref: Magit is slow404136
Ref: I changed several thousand files at once and now Magit is unusable404282
Ref: I am having problems committing404821
Ref: I am using MS Windows and cannot push with Magit405086
Ref: I am using macOS and SOMETHING works in shell but not in Magit405484
Ref: Expanding a file to show the diff causes it to disappear406071
Ref: Point is wrong in the COMMIT_EDITMSG buffer406421
Ref: The mode-line information isn't always up-to-date407245
Ref: A branch and tag sharing the same name breaks SOMETHING408076
Ref: My Git hooks work on the command-line but not inside Magit408724
Ref: git-commit-mode isn't used when committing from the command-line409316
Ref: Point ends up inside invisible text when jumping to a file-visiting buffer411304
Ref: I am no longer able to save popup defaults411896
Node: Debugging Tools412689
Node: Keystroke Index416624
Node: Function and Command Index454793
Node: Variable Index506438
Ref: Mapping Git Hooks to Lisp Hooks97436
Node: Inspecting100877
Node: Status Buffer102024
Ref: Status Sections106148
Ref: Status File List Sections109610
Ref: Status Log Sections112180
Ref: Status Header Sections113530
Ref: Status Module Sections116021
Ref: Status Options118395
Node: Repository List119670
Node: Logging124457
Ref: Refreshing Logs127188
Ref: Log Buffer128532
Ref: Log Margin133249
Ref: Select from Log136312
Ref: Reflog138434
Ref: Cherries139987
Node: Diffing141763
Ref: Refreshing Diffs145708
Ref: Commands Available in Diffs150986
Ref: Diff Options153381
Ref: Revision Buffer160882
Node: Ediffing164136
Node: References Buffer170180
Ref: References Sections180743
Node: Bisecting181528
Node: Visiting Files and Blobs183835
Ref: General-Purpose Visit Commands184277
Ref: Visiting Files and Blobs from a Diff185095
Node: Blaming190343
Node: Manipulating197321
Node: Creating Repository197663
Node: Cloning Repository198200
Node: Staging and Unstaging204639
Ref: Staging from File-Visiting Buffers208567
Node: Applying209582
Node: Committing211655
Ref: Initiating a Commit212280
Ref: Creating a new commit212592
Ref: Editing the last commit212702
Ref: Editing any reachable commit214681
Ref: Editing any reachable commit and rebasing immediately219094
Ref: Options used by commit commands220742
Ref: Used by all or most commit commands220814
Ref: Used by all squash and fixup commands223043
Ref: Used by specific commit commands223597
Ref: Editing Commit Messages223921
Ref: Using the Revision Stack226475
Ref: Commit Pseudo Headers229435
Ref: Commit Mode and Hooks230587
Ref: Commit Message Conventions233296
Node: Branching235184
Ref: The Two Remotes235305
Ref: Branch Commands237870
Ref: Branch Git Variables250727
Ref: Auxiliary Branch Commands255972
Node: Merging256989
Node: Resolving Conflicts261338
Node: Rebasing266708
Ref: Editing Rebase Sequences271905
Ref: Information About In-Progress Rebase277134
Ref: Rebasing-Footnote-1286126
Node: Cherry Picking286722
Ref: Reverting291030
Node: Resetting292390
Node: Stashing294214
Node: Transferring300453
Node: Remotes300675
Ref: Remote Commands300772
Ref: Remote Git Variables304716
Node: Fetching306649
Node: Pulling309132
Node: Pushing310158
Node: Plain Patches314445
Node: Maildir Patches315916
Node: Miscellaneous317395
Node: Tagging317741
Node: Notes319634
Node: Submodules321969
Ref: Listing Submodules322130
Ref: Submodule Transient324191
Node: Subtree326544
Node: Worktree328475
Node: Sparse checkouts329790
Node: Bundle332562
Node: Common Commands332937
Node: Wip Modes335563
Ref: Wip Graph340137
Node: Commands for Buffers Visiting Files342383
Node: Minor Mode for Buffers Visiting Blobs350698
Node: Customizing351861
Node: Per-Repository Configuration353453
Node: Essential Settings355707
Ref: Safety355996
Ref: Performance357671
Ref: Log Performance360462
Ref: Diff Performance361761
Ref: Refs Buffer Performance363102
Ref: Committing Performance363675
Ref: Microsoft Windows Performance364655
Ref: MacOS Performance365742
Ref: Global Bindings366625
Ref: Essential Settings-Footnote-1368798
Node: Plumbing368880
Node: Calling Git369705
Ref: Getting a Value from Git371164
Ref: Calling Git for Effect374782
Node: Section Plumbing380721
Ref: Creating Sections380873
Ref: Section Selection384683
Ref: Matching Sections386380
Node: Refreshing Buffers392282
Node: Conventions395422
Ref: Theming Faces395586
Node: FAQ403619
Node: FAQ - How to ...?404055
Ref: How to pronounce Magit?404188
Ref: How to show git's output?404880
Ref: How to install the gitman info manual?405497
Ref: How to show diffs for gpg-encrypted files?406302
Ref: How does branching and pushing work?406711
Ref: Should I disable VC?406875
Ref: The diff/log is filtered to one file; how do I show all changes407358
Node: FAQ - Issues and Errors407730
Ref: Magit is slow407875
Ref: I changed several thousand files at once and now Magit is unusable408021
Ref: I am having problems committing408560
Ref: I am using MS Windows and cannot push with Magit408825
Ref: I am using macOS and SOMETHING works in shell but not in Magit409223
Ref: Expanding a file to show the diff causes it to disappear409810
Ref: Point is wrong in the COMMIT_EDITMSG buffer410160
Ref: The mode-line information isn't always up-to-date410984
Ref: A branch and tag sharing the same name breaks SOMETHING411815
Ref: My Git hooks work on the command-line but not inside Magit412463
Ref: git-commit-mode isn't used when committing from the command-line413055
Ref: Point ends up inside invisible text when jumping to a file-visiting buffer415043
Ref: I am no longer able to save popup defaults415635
Node: Debugging Tools416428
Node: Keystroke Index420363
Node: Function and Command Index458678
Node: Variable Index510396

End Tag Table