magit.info (540876B)
1 This is magit.info, produced by makeinfo version 6.8 from magit.texi. 2 3 Copyright (C) 2015-2024 Jonas Bernoulli 4 <emacs.magit@jonas.bernoulli.dev> 5 6 You can redistribute this document and/or modify it under the terms 7 of the GNU General Public License as published by the Free Software 8 Foundation, either version 3 of the License, or (at your option) 9 any later version. 10 11 This document is distributed in the hope that it will be useful, 12 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 General Public License for more details. 15 16 INFO-DIR-SECTION Emacs 17 START-INFO-DIR-ENTRY 18 * Magit: (magit). Using Git from Emacs with Magit. 19 END-INFO-DIR-ENTRY 20 21 22 File: magit.info, Node: Top, Next: Introduction, Up: (dir) 23 24 Magit User Manual 25 ***************** 26 27 Magit is an interface to the version control system Git, implemented as 28 an Emacs package. Magit aspires to be a complete Git porcelain. While 29 we cannot (yet) claim that Magit wraps and improves upon each and every 30 Git command, it is complete enough to allow even experienced Git users 31 to perform almost all of their daily version control tasks directly from 32 within Emacs. While many fine Git clients exist, only Magit and Git 33 itself deserve to be called porcelains. 34 35 This manual is for Magit version 4.1.3. 36 37 Copyright (C) 2015-2024 Jonas Bernoulli 38 <emacs.magit@jonas.bernoulli.dev> 39 40 You can redistribute this document and/or modify it under the terms 41 of the GNU General Public License as published by the Free Software 42 Foundation, either version 3 of the License, or (at your option) 43 any later version. 44 45 This document is distributed in the hope that it will be useful, 46 but WITHOUT ANY WARRANTY; without even the implied warranty of 47 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 48 General Public License for more details. 49 50 * Menu: 51 52 * Introduction:: 53 * Installation:: 54 * Getting Started:: 55 * Interface Concepts:: 56 * Inspecting:: 57 * Manipulating:: 58 * Transferring:: 59 * Miscellaneous:: 60 * Customizing:: 61 * Plumbing:: 62 * FAQ:: 63 * Debugging Tools:: 64 * Keystroke Index:: 65 * Function and Command Index:: 66 * Variable Index:: 67 68 — The Detailed Node Listing — 69 70 Installation 71 72 * Installing from Melpa:: 73 * Installing from the Git Repository:: 74 * Post-Installation Tasks:: 75 76 Interface Concepts 77 78 * Modes and Buffers:: 79 * Sections:: 80 * Transient Commands:: 81 * Transient Arguments and Buffer Variables:: 82 * Completion, Confirmation and the Selection: Completion Confirmation and the Selection. 83 * Mouse Support:: 84 * Running Git:: 85 86 Modes and Buffers 87 88 * Switching Buffers:: 89 * Naming Buffers:: 90 * Quitting Windows:: 91 * Automatic Refreshing of Magit Buffers:: 92 * Automatic Saving of File-Visiting Buffers:: 93 * Automatic Reverting of File-Visiting Buffers:: 94 95 96 Sections 97 98 * Section Movement:: 99 * Section Visibility:: 100 * Section Hooks:: 101 * Section Types and Values:: 102 * Section Options:: 103 104 105 Completion, Confirmation and the Selection 106 107 * Action Confirmation:: 108 * Completion and Confirmation:: 109 * The Selection:: 110 * The hunk-internal region:: 111 * Support for Completion Frameworks:: 112 * Additional Completion Options:: 113 114 115 Running Git 116 117 * Viewing Git Output:: 118 * Git Process Status:: 119 * Running Git Manually:: 120 * Git Executable:: 121 * Global Git Arguments:: 122 123 124 Inspecting 125 126 * Status Buffer:: 127 * Repository List:: 128 * Logging:: 129 * Diffing:: 130 * Ediffing:: 131 * References Buffer:: 132 * Bisecting:: 133 * Visiting Files and Blobs:: 134 * Blaming:: 135 136 Status Buffer 137 138 * Status Sections:: 139 * Status Header Sections:: 140 * Status Module Sections:: 141 * Status Options:: 142 143 144 Logging 145 146 * Refreshing Logs:: 147 * Log Buffer:: 148 * Log Margin:: 149 * Select from Log:: 150 * Reflog:: 151 * Cherries:: 152 153 154 Diffing 155 156 * Refreshing Diffs:: 157 * Commands Available in Diffs:: 158 * Diff Options:: 159 * Revision Buffer:: 160 161 162 References Buffer 163 164 * References Sections:: 165 166 167 Visiting Files and Blobs 168 169 * General-Purpose Visit Commands:: 170 * Visiting Files and Blobs from a Diff:: 171 172 173 Manipulating 174 175 * Creating Repository:: 176 * Cloning Repository:: 177 * Staging and Unstaging:: 178 * Applying:: 179 * Committing:: 180 * Branching:: 181 * Merging:: 182 * Resolving Conflicts:: 183 * Rebasing:: 184 * Cherry Picking:: 185 * Resetting:: 186 * Stashing:: 187 188 Staging and Unstaging 189 190 * Staging from File-Visiting Buffers:: 191 192 193 Committing 194 195 * Initiating a Commit:: 196 * Editing Commit Messages:: 197 198 199 Branching 200 201 * The Two Remotes:: 202 * Branch Commands:: 203 * Branch Git Variables:: 204 * Auxiliary Branch Commands:: 205 206 207 Rebasing 208 209 * Editing Rebase Sequences:: 210 * Information About In-Progress Rebase:: 211 212 213 Cherry Picking 214 215 * Reverting:: 216 217 218 Transferring 219 220 * Remotes:: 221 * Fetching:: 222 * Pulling:: 223 * Pushing:: 224 * Plain Patches:: 225 * Maildir Patches:: 226 227 Remotes 228 229 * Remote Commands:: 230 * Remote Git Variables:: 231 232 233 Miscellaneous 234 235 * Tagging:: 236 * Notes:: 237 * Submodules:: 238 * Subtree:: 239 * Worktree:: 240 * Sparse checkouts:: 241 * Bundle:: 242 * Common Commands:: 243 * Wip Modes:: 244 * Commands for Buffers Visiting Files:: 245 * Minor Mode for Buffers Visiting Blobs:: 246 247 Submodules 248 249 * Listing Submodules:: 250 * Submodule Transient:: 251 252 253 Wip Modes 254 255 * Wip Graph:: 256 * Legacy Wip Modes:: 257 258 259 Customizing 260 261 * Per-Repository Configuration:: 262 * Essential Settings:: 263 264 Essential Settings 265 266 * Safety:: 267 * Performance:: 268 * Global Bindings:: 269 270 271 Plumbing 272 273 * Calling Git:: 274 * Section Plumbing:: 275 * Refreshing Buffers:: 276 * Conventions:: 277 278 Calling Git 279 280 * Getting a Value from Git:: 281 * Calling Git for Effect:: 282 283 284 Section Plumbing 285 286 * Creating Sections:: 287 * Section Selection:: 288 * Matching Sections:: 289 290 291 Conventions 292 293 * Theming Faces:: 294 295 296 FAQ 297 298 * FAQ - How to ...?:: 299 * FAQ - Issues and Errors:: 300 301 FAQ - How to ...? 302 303 * How to pronounce Magit?:: 304 * How to show git's output?:: 305 * How to install the gitman info manual?:: 306 * How to show diffs for gpg-encrypted files?:: 307 * How does branching and pushing work?:: 308 * Should I disable VC?:: 309 310 311 FAQ - Issues and Errors 312 313 * Magit is slow:: 314 * I changed several thousand files at once and now Magit is unusable:: 315 * I am having problems committing:: 316 * I am using MS Windows and cannot push with Magit:: 317 * I am using macOS and SOMETHING works in shell, but not in Magit: I am using macOS and SOMETHING works in shell but not in Magit. 318 * Expanding a file to show the diff causes it to disappear:: 319 * Point is wrong in the COMMIT_EDITMSG buffer:: 320 * The mode-line information isn't always up-to-date:: 321 * A branch and tag sharing the same name breaks SOMETHING:: 322 * My Git hooks work on the command-line but not inside Magit:: 323 * git-commit-mode isn't used when committing from the command-line:: 324 * Point ends up inside invisible text when jumping to a file-visiting buffer:: 325 * I am no longer able to save popup defaults:: 326 327 328 329 330 File: magit.info, Node: Introduction, Next: Installation, Prev: Top, Up: Top 331 332 1 Introduction 333 ************** 334 335 Magit is an interface to the version control system Git, implemented as 336 an Emacs package. Magit aspires to be a complete Git porcelain. While 337 we cannot (yet) claim that Magit wraps and improves upon each and every 338 Git command, it is complete enough to allow even experienced Git users 339 to perform almost all of their daily version control tasks directly from 340 within Emacs. While many fine Git clients exist, only Magit and Git 341 itself deserve to be called porcelains. 342 343 Staging and otherwise applying changes is one of the most important 344 features in a Git porcelain and here Magit outshines anything else, 345 including Git itself. Git’s own staging interface (‘git add --patch’) 346 is so cumbersome that many users only use it in exceptional cases. In 347 Magit staging a hunk or even just part of a hunk is as trivial as 348 staging all changes made to a file. 349 350 The most visible part of Magit’s interface is the status buffer, 351 which displays information about the current repository. Its content is 352 created by running several Git commands and making their output 353 actionable. Among other things, it displays information about the 354 current branch, lists unpulled and unpushed changes and contains 355 sections displaying the staged and unstaged changes. That might sound 356 noisy, but, since sections are collapsible, it’s not. 357 358 To stage or unstage a change one places the cursor on the change and 359 then types ‘s’ or ‘u’. The change can be a file or a hunk, or when the 360 region is active (i.e., when there is a selection) several files or 361 hunks, or even just part of a hunk. The change or changes that these 362 commands - and many others - would act on are highlighted. 363 364 Magit also implements several other "apply variants" in addition to 365 staging and unstaging. One can discard or reverse a change, or apply it 366 to the working tree. Git’s own porcelain only supports this for staging 367 and unstaging and you would have to do something like ‘git diff ... | 368 ??? | git apply ...’ to discard, revert, or apply a single hunk on the 369 command line. In fact that’s exactly what Magit does internally (which 370 is what lead to the term "apply variants"). 371 372 Magit isn’t just for Git experts, but it does assume some prior 373 experience with Git as well as Emacs. That being said, many users have 374 reported that using Magit was what finally taught them what Git is 375 capable of and how to use it to its fullest. Other users wished they 376 had switched to Emacs sooner so that they would have gotten their hands 377 on Magit earlier. 378 379 While one has to know the basic features of Emacs to be able to make 380 full use of Magit, acquiring just enough Emacs skills doesn’t take long 381 and is worth it, even for users who prefer other editors. Vim users are 382 advised to give Evil (https://github.com/emacs-evil/evil), the 383 "Extensible VI Layer for Emacs", and Spacemacs 384 (https://github.com/syl20bnr/spacemacs), an "Emacs starter-kit focused 385 on Evil" a try. 386 387 Magit provides a consistent and efficient Git porcelain. After a 388 short learning period, you will be able to perform most of your daily 389 version control tasks faster than you would on the command line. You 390 will likely also start using features that seemed too daunting in the 391 past. 392 393 Magit fully embraces Git. It exposes many advanced features using a 394 simple but flexible interface instead of only wrapping the trivial ones 395 like many GUI clients do. Of course Magit supports logging, cloning, 396 pushing, and other commands that usually don’t fail in spectacular ways; 397 but it also supports tasks that often cannot be completed in a single 398 step. Magit fully supports tasks such as merging, rebasing, 399 cherry-picking, reverting, and blaming by not only providing a command 400 to initiate these tasks but also by displaying context sensitive 401 information along the way and providing commands that are useful for 402 resolving conflicts and resuming the sequence after doing so. 403 404 Magit wraps and in many cases improves upon at least the following 405 Git porcelain commands: ‘add’, ‘am’, ‘bisect’, ‘blame’, ‘branch’, 406 ‘checkout’, ‘cherry’, ‘cherry-pick’, ‘clean’, ‘clone’, ‘commit’, 407 ‘config’, ‘describe’, ‘diff’, ‘fetch’, ‘format-patch’, ‘init’, ‘log’, 408 ‘merge’, ‘merge-tree’, ‘mv’, ‘notes’, ‘pull’, ‘rebase’, ‘reflog’, 409 ‘remote’, ‘request-pull’, ‘reset’, ‘revert’, ‘rm’, ‘show’, ‘stash’, 410 ‘submodule’, ‘subtree’, ‘tag’, and ‘worktree.’ Many more Magit porcelain 411 commands are implemented on top of Git plumbing commands. 412 413 414 File: magit.info, Node: Installation, Next: Getting Started, Prev: Introduction, Up: Top 415 416 2 Installation 417 ************** 418 419 Magit can be installed using Emacs’ package manager or manually from its 420 development repository. 421 422 * Menu: 423 424 * Installing from Melpa:: 425 * Installing from the Git Repository:: 426 * Post-Installation Tasks:: 427 428 429 File: magit.info, Node: Installing from Melpa, Next: Installing from the Git Repository, Up: Installation 430 431 2.1 Installing from Melpa 432 ========================= 433 434 Magit is available from Melpa and Melpa-Stable. If you haven’t used 435 Emacs’ package manager before, then it is high time you familiarize 436 yourself with it by reading the documentation in the Emacs manual, see 437 *note (emacs)Packages::. Then add one of the archives to 438 ‘package-archives’: 439 440 • To use Melpa: 441 442 (require 'package) 443 (add-to-list 'package-archives 444 '("melpa" . "https://melpa.org/packages/") t) 445 446 • To use Melpa-Stable: 447 448 (require 'package) 449 (add-to-list 'package-archives 450 '("melpa-stable" . "https://stable.melpa.org/packages/") t) 451 452 Once you have added your preferred archive, you need to update the 453 local package list using: 454 455 M-x package-refresh-contents RET 456 457 Once you have done that, you can install Magit and its dependencies 458 using: 459 460 M-x package-install RET magit RET 461 462 Now see *note Post-Installation Tasks::. 463 464 465 File: magit.info, Node: Installing from the Git Repository, Next: Post-Installation Tasks, Prev: Installing from Melpa, Up: Installation 466 467 2.2 Installing from the Git Repository 468 ====================================== 469 470 Magit depends on the ‘compat’, ‘dash’, ‘transient’ and ‘with-editor’ 471 libraries which are available from Melpa and Melpa-Stable. Install them 472 using ‘M-x package-install RET <package> RET’. Of course you may also 473 install them manually from their repository. 474 475 Then clone the Magit repository: 476 477 $ git clone https://github.com/magit/magit.git ~/.emacs.d/site-lisp/magit 478 $ cd ~/.emacs.d/site-lisp/magit 479 480 Then compile the libraries and generate the info manuals: 481 482 $ make 483 484 If you haven’t installed ‘compat’, ‘dash’, ‘transient’ and 485 ‘with-editor’ from Melpa or at ‘/path/to/magit/../<package>’, then you 486 have to tell ‘make’ where to find them. To do so create the file 487 ‘/path/to/magit/config.mk’ with the following content before running 488 ‘make’: 489 490 LOAD_PATH = -L ~/.emacs.d/site-lisp/magit/lisp 491 LOAD_PATH += -L ~/.emacs.d/site-lisp/dash 492 LOAD_PATH += -L ~/.emacs.d/site-lisp/transient/lisp 493 LOAD_PATH += -L ~/.emacs.d/site-lisp/with-editor/lisp 494 LOAD_PATH += -L ~/.emacs.d/site-lisp/compat 495 496 Finally add this to your init file: 497 498 (add-to-list 'load-path "~/.emacs.d/site-lisp/magit/lisp") 499 (require 'magit) 500 501 (with-eval-after-load 'info 502 (info-initialize) 503 (add-to-list 'Info-directory-list 504 "~/.emacs.d/site-lisp/magit/Documentation/")) 505 506 Of course if you installed the dependencies manually as well, then 507 you have to tell Emacs about them too, by prefixing the above with: 508 509 (add-to-list 'load-path "~/.emacs.d/site-lisp/dash") 510 (add-to-list 'load-path "~/.emacs.d/site-lisp/transient/lisp") 511 (add-to-list 'load-path "~/.emacs.d/site-lisp/with-editor") 512 513 Note that you have to add the ‘lisp’ subdirectory to the ‘load-path’, 514 not the top-level of the repository, and that elements of ‘load-path’ 515 should not end with a slash, while those of ‘Info-directory-list’ 516 should. 517 518 Instead of requiring the feature ‘magit’, you could load just the 519 autoload definitions, by loading the file ‘magit-autoloads.el’. 520 521 (load "/path/to/magit/lisp/magit-autoloads") 522 523 Instead of running Magit directly from the repository by adding that 524 to the ‘load-path’, you might want to instead install it in some other 525 directory using ‘sudo make install’ and setting ‘load-path’ accordingly. 526 527 To update Magit use: 528 529 $ git pull 530 $ make 531 532 At times it might be necessary to run ‘make clean all’ instead. 533 534 To view all available targets use ‘make help’. 535 536 Now see *note Post-Installation Tasks::. 537 538 539 File: magit.info, Node: Post-Installation Tasks, Prev: Installing from the Git Repository, Up: Installation 540 541 2.3 Post-Installation Tasks 542 =========================== 543 544 After installing Magit you should verify that you are indeed using the 545 Magit, Git, and Emacs releases you think you are using. It’s best to 546 restart Emacs before doing so, to make sure you are not using an 547 outdated value for ‘load-path’. 548 549 M-x magit-version RET 550 551 should display something like 552 553 Magit 2.8.0, Git 2.10.2, Emacs 25.1.1, gnu/linux 554 555 Then you might also want to read about options that many users likely 556 want to customize. See *note Essential Settings::. 557 558 To be able to follow cross references to Git manpages found in this 559 manual, you might also have to manually install the ‘gitman’ info 560 manual, or advice ‘Info-follow-nearest-node’ to instead open the actual 561 manpage. See *note How to install the gitman info manual?::. 562 563 If you are completely new to Magit then see *note Getting Started::. 564 565 If you run into problems, then please see the *note FAQ::. Also see 566 the *note Debugging Tools::. 567 568 And last but not least please consider making a donation, to ensure 569 that I can keep working on Magit. See <https://magit.vc/donations>. 570 for various donation options. 571 572 573 File: magit.info, Node: Getting Started, Next: Interface Concepts, Prev: Installation, Up: Top 574 575 3 Getting Started 576 ***************** 577 578 This short tutorial describes the most essential features that many 579 Magitians use on a daily basis. It only scratches the surface but 580 should be enough to get you started. 581 582 IMPORTANT: It is safest if you clone some repository just for this 583 tutorial. Alternatively you can use an existing local repository, but 584 if you do that, then you should commit all uncommitted changes before 585 proceeding. 586 587 Type ‘C-x g’ to display information about the current Git repository 588 in a dedicated buffer, called the status buffer. 589 590 Most Magit commands are commonly invoked from the status buffer. It 591 can be considered the primary interface for interacting with Git using 592 Magit. Many other Magit buffers may exist at a given time, but they are 593 often created from this buffer. 594 595 Depending on what state your repository is in, this buffer may 596 contain sections titled "Staged changes", "Unstaged changes", "Unmerged 597 into origin/master", "Unpushed to origin/master", and many others. 598 599 Since we are starting from a safe state, which you can easily return 600 to (by doing a ‘git reset --hard PRE-MAGIT-STATE’), there currently are 601 no staged or unstaged changes. Edit some files and save the changes. 602 Then go back to the status buffer, while at the same time refreshing it, 603 by typing ‘C-x g’. (When the status buffer, or any Magit buffer for 604 that matter, is the current buffer, then you can also use just ‘g’ to 605 refresh it). 606 607 Move between sections using ‘p’ and ‘n’. Note that the bodies of 608 some sections are hidden. Type ‘TAB’ to expand or collapse the section 609 at point. You can also use ‘C-tab’ to cycle the visibility of the 610 current section and its children. Move to a file section inside the 611 section named "Unstaged changes" and type ‘s’ to stage the changes you 612 have made to that file. That file now appears under "Staged changes". 613 614 Magit can stage and unstage individual hunks, not just complete 615 files. Move to the file you have just staged, expand it using ‘TAB’, 616 move to one of the hunks using ‘n’, and unstage just that by typing ‘u’. 617 Note how the staging (‘s’) and unstaging (‘u’) commands operate on the 618 change at point. Many other commands behave the same way. 619 620 You can also un-/stage just part of a hunk. Inside the body of a 621 hunk section (move there using ‘C-n’), set the mark using ‘C-SPC’ and 622 move down until some added and/or removed lines fall inside the region 623 but not all of them. Again type ‘s’ to stage. 624 625 It is also possible to un-/stage multiple files at once. Move to a 626 file section, type ‘C-SPC’, move to the next file using ‘n’, and then 627 ‘s’ to stage both files. Note that both the mark and point have to be 628 on the headings of sibling sections for this to work. If the region 629 looks like it does in other buffers, then it doesn’t select Magit 630 sections that can be acted on as a unit. 631 632 And then of course you want to commit your changes. Type ‘c’. This 633 shows the available commit commands and arguments in a buffer at the 634 bottom of the frame. Each command and argument is prefixed with the key 635 that invokes/sets it. Do not worry about this for now. We want to 636 create a "normal" commit, which is done by typing ‘c’ again. 637 638 Now two new buffers appear. One is for writing the commit message, 639 the other shows a diff with the changes that you are about to commit. 640 Write a message and then type ‘C-c C-c’ to actually create the commit. 641 642 You probably don’t want to push the commit you just created because 643 you just committed some random changes, but if that is not the case you 644 could push it by typing ‘P’ to show all the available push commands and 645 arguments and then ‘p’ to push to a branch with the same name as the 646 local branch onto the remote configured as the push-remote. (If the 647 push-remote is not configured yet, then you would first be prompted for 648 the remote to push to.) 649 650 So far we have mentioned the commit and push menu commands. These 651 are probably among the menus you will be using the most, but many others 652 exist. To show a menu that lists all other menus (as well as the 653 various apply commands and some other essential commands), type ‘h’. 654 Try a few. (Such menus are also called "transient prefix commands" or 655 just "transients".) 656 657 The key bindings in that menu correspond to the bindings in Magit 658 buffers, including but not limited to the status buffer. So you could 659 type ‘h d’ to bring up the diff menu, but once you remember that "d" 660 stands for "diff", you would usually do so by just typing ‘d’. 661 662 This "prefix of prefixes" is useful even once you have memorized all 663 the bindings, as it can provide easy access to Magit commands from 664 non-Magit buffers. So, by default, it is globally bound to ‘C-x M-g’. 665 666 A similar menu featuring (for the most part) commands that act on 667 just the file being visited in the current buffer, is globally bound to 668 ‘C-c M-g’. That binding can also be used in buffers, which do not visit 669 a file, but then only a subset of the commands is available. 670 671 The global key bindings mentioned in the previous two paragraphs are 672 quite inconvenient. We recommend using ‘C-c g’ and ‘C-c f’ instead, but 673 cannot use those key sequences by default because they are strictly 674 reserved for bindings added by the user. See *note Global Bindings::, 675 if you want to explicitly opt-in to the recommended key bindings. 676 677 Magit also provides context menus and other mouse commands, see *note 678 Mouse Support::. 679 680 It is not necessary that you do so now, but if you stick with Magit, 681 then it is highly recommended that you read the next section too. 682 683 684 File: magit.info, Node: Interface Concepts, Next: Inspecting, Prev: Getting Started, Up: Top 685 686 4 Interface Concepts 687 ******************** 688 689 * Menu: 690 691 * Modes and Buffers:: 692 * Sections:: 693 * Transient Commands:: 694 * Transient Arguments and Buffer Variables:: 695 * Completion, Confirmation and the Selection: Completion Confirmation and the Selection. 696 * Mouse Support:: 697 * Running Git:: 698 699 700 File: magit.info, Node: Modes and Buffers, Next: Sections, Up: Interface Concepts 701 702 4.1 Modes and Buffers 703 ===================== 704 705 Magit provides several major-modes. For each of these modes there 706 usually exists only one buffer per repository. Separate modes and thus 707 buffers exist for commits, diffs, logs, and some other things. 708 709 Besides these special purpose buffers, there also exists an overview 710 buffer, called the *status buffer*. It’s usually from this buffer that 711 the user invokes Git commands, or creates or visits other buffers. 712 713 In this manual we often speak about "Magit buffers". By that we mean 714 buffers whose major-modes derive from ‘magit-mode’. 715 716 ‘M-x magit-toggle-buffer-lock’ 717 This command locks the current buffer to its value or if the buffer 718 is already locked, then it unlocks it. 719 720 Locking a buffer to its value prevents it from being reused to 721 display another value. The name of a locked buffer contains its 722 value, which allows telling it apart from other locked buffers and 723 the unlocked buffer. 724 725 Not all Magit buffers can be locked to their values; for example, 726 it wouldn’t make sense to lock a status buffer. 727 728 There can only be a single unlocked buffer using a certain 729 major-mode per repository. So when a buffer is being unlocked and 730 another unlocked buffer already exists for that mode and 731 repository, then the former buffer is instead deleted and the 732 latter is displayed in its place. 733 734 * Menu: 735 736 * Switching Buffers:: 737 * Naming Buffers:: 738 * Quitting Windows:: 739 * Automatic Refreshing of Magit Buffers:: 740 * Automatic Saving of File-Visiting Buffers:: 741 * Automatic Reverting of File-Visiting Buffers:: 742 743 744 File: magit.info, Node: Switching Buffers, Next: Naming Buffers, Up: Modes and Buffers 745 746 4.1.1 Switching Buffers 747 ----------------------- 748 749 -- Function: magit-display-buffer buffer &optional display-function 750 This function is a wrapper around ‘display-buffer’ and is used to 751 display any Magit buffer. It displays BUFFER in some window and, 752 unlike ‘display-buffer’, also selects that window, provided 753 ‘magit-display-buffer-noselect’ is ‘nil’. It also runs the hooks 754 mentioned below. 755 756 If optional DISPLAY-FUNCTION is non-nil, then that is used to 757 display the buffer. Usually that is ‘nil’ and the function 758 specified by ‘magit-display-buffer-function’ is used. 759 760 -- Variable: magit-display-buffer-noselect 761 When this is non-nil, then ‘magit-display-buffer’ only displays the 762 buffer but forgoes also selecting the window. This variable should 763 not be set globally, it is only intended to be let-bound, by code 764 that automatically updates "the other window". This is used for 765 example when the revision buffer is updated when you move inside 766 the log buffer. 767 768 -- User Option: magit-display-buffer-function 769 The function specified here is called by ‘magit-display-buffer’ 770 with one argument, a buffer, to actually display that buffer. This 771 function should call ‘display-buffer’ with that buffer as first and 772 a list of display actions as second argument. 773 774 Magit provides several functions, listed below, that are suitable 775 values for this option. If you want to use different rules, then a 776 good way of doing that is to start with a copy of one of these 777 functions and then adjust it to your needs. 778 779 Instead of using a wrapper around ‘display-buffer’, that function 780 itself can be used here, in which case the display actions have to 781 be specified by adding them to ‘display-buffer-alist’ instead. 782 783 To learn about display actions, see *note (elisp)Choosing Window::. 784 785 -- Function: magit-display-buffer-traditional buffer 786 This function is the current default value of the option 787 ‘magit-display-buffer-function’. Before that option and this 788 function were added, the behavior was hard-coded in many places all 789 over the code base but now all the rules are contained in this one 790 function (except for the "noselect" special case mentioned above). 791 792 -- Function: magit-display-buffer-same-window-except-diff-v1 793 This function displays most buffers in the currently selected 794 window. If a buffer’s mode derives from ‘magit-diff-mode’ or 795 ‘magit-process-mode’, it is displayed in another window. 796 797 -- Function: magit-display-buffer-fullframe-status-v1 798 This function fills the entire frame when displaying a status 799 buffer. Otherwise, it behaves like 800 ‘magit-display-buffer-traditional’. 801 802 -- Function: magit-display-buffer-fullframe-status-topleft-v1 803 This function fills the entire frame when displaying a status 804 buffer. It behaves like ‘magit-display-buffer-fullframe-status-v1’ 805 except that it displays buffers that derive from ‘magit-diff-mode’ 806 or ‘magit-process-mode’ to the top or left of the current buffer 807 rather than to the bottom or right. As a result, Magit buffers 808 tend to pop up on the same side as they would if 809 ‘magit-display-buffer-traditional’ were in use. 810 811 -- Function: magit-display-buffer-fullcolumn-most-v1 812 This function displays most buffers so that they fill the entire 813 height of the frame. However, the buffer is displayed in another 814 window if (1) the buffer’s mode derives from ‘magit-process-mode’, 815 or (2) the buffer’s mode derives from ‘magit-diff-mode’, provided 816 that the mode of the current buffer derives from ‘magit-log-mode’ 817 or ‘magit-cherry-mode’. 818 819 -- User Option: magit-pre-display-buffer-hook 820 This hook is run by ‘magit-display-buffer’ before displaying the 821 buffer. 822 823 -- Function: magit-save-window-configuration 824 This function saves the current window configuration. Later when 825 the buffer is buried, it may be restored by 826 ‘magit-restore-window-configuration’. 827 828 -- User Option: magit-post-display-buffer-hook 829 This hook is run by ‘magit-display-buffer’ after displaying the 830 buffer. 831 832 -- Function: magit-maybe-set-dedicated 833 This function remembers if a new window had to be created to 834 display the buffer, or whether an existing window was reused. This 835 information is later used by ‘magit-mode-quit-window’, to determine 836 whether the window should be deleted when its last Magit buffer is 837 buried. 838 839 840 File: magit.info, Node: Naming Buffers, Next: Quitting Windows, Prev: Switching Buffers, Up: Modes and Buffers 841 842 4.1.2 Naming Buffers 843 -------------------- 844 845 -- User Option: magit-generate-buffer-name-function 846 The function used to generate the names of Magit buffers. 847 848 Such a function should take the options 849 ‘magit-uniquify-buffer-names’ as well as ‘magit-buffer-name-format’ 850 into account. If it doesn’t, then should be clearly stated in the 851 doc-string. And if it supports %-sequences beyond those mentioned 852 in the doc-string of the option ‘magit-buffer-name-format’, then 853 its own doc-string should describe the additions. 854 855 -- Function: magit-generate-buffer-name-default-function mode 856 This function returns a buffer name suitable for a buffer whose 857 major-mode is MODE and which shows information about the repository 858 in which ‘default-directory’ is located. 859 860 This function uses ‘magit-buffer-name-format’ and supporting all of 861 the %-sequences mentioned the documentation of that option. It 862 also respects the option ‘magit-uniquify-buffer-names’. 863 864 -- User Option: magit-buffer-name-format 865 The format string used to name Magit buffers. 866 867 At least the following %-sequences are supported: 868 869 • ‘%m’ 870 871 The name of the major-mode, but with the ‘-mode’ suffix 872 removed. 873 874 • ‘%M’ 875 876 Like ‘%m’ but abbreviate ‘magit-status-mode’ as ‘magit’. 877 878 • ‘%v’ 879 880 The value the buffer is locked to, in parentheses, or an empty 881 string if the buffer is not locked to a value. 882 883 • ‘%V’ 884 885 Like ‘%v’, but the string is prefixed with a space, unless it 886 is an empty string. 887 888 • ‘%t’ 889 890 The top-level directory of the working tree of the repository, 891 or if ‘magit-uniquify-buffer-names’ is non-nil an abbreviation 892 of that. 893 894 • ‘%x’ 895 896 If ‘magit-uniquify-buffer-names’ is nil "*", otherwise the 897 empty string. Due to limitations of the ‘uniquify’ package, 898 buffer names must end with the path. 899 900 The value should always contain ‘%m’ or ‘%M’, ‘%v’ or ‘%V’, and 901 ‘%t’. If ‘magit-uniquify-buffer-names’ is non-nil, then the value 902 must end with ‘%t’ or ‘%t%x’. See issue #2841. 903 904 -- User Option: magit-uniquify-buffer-names 905 This option controls whether the names of Magit buffers are 906 uniquified. If the names are not being uniquified, then they 907 contain the full path of the top-level of the working tree of the 908 corresponding repository. If they are being uniquified, then they 909 end with the basename of the top-level, or if that would conflict 910 with the name used for other buffers, then the names of all these 911 buffers are adjusted until they no longer conflict. 912 913 This is done using the ‘uniquify’ package; customize its options to 914 control how buffer names are uniquified. 915 916 917 File: magit.info, Node: Quitting Windows, Next: Automatic Refreshing of Magit Buffers, Prev: Naming Buffers, Up: Modes and Buffers 918 919 4.1.3 Quitting Windows 920 ---------------------- 921 922 ‘q’ (‘magit-mode-bury-buffer’) 923 This command buries or kills the current Magit buffer. The 924 function specified by option ‘magit-bury-buffer-function’ is used 925 to bury the buffer when called without a prefix argument or to kill 926 it when called with a single prefix argument. 927 928 When called with two or more prefix arguments then it always kills 929 all Magit buffers, associated with the current project, including 930 the current buffer. 931 932 -- User Option: magit-bury-buffer-function 933 The function used to actually bury or kill the current buffer. 934 935 ‘magit-mode-bury-buffer’ calls this function with one argument. If 936 the argument is non-nil, then the function has to kill the current 937 buffer. Otherwise it has to bury it alive. The default value 938 currently is ‘magit-mode-quit-window’. 939 940 -- Function: magit-restore-window-configuration kill-buffer 941 Bury or kill the current buffer using ‘quit-window’, which is 942 called with KILL-BUFFER as first and the selected window as second 943 argument. 944 945 Then restore the window configuration that existed right before the 946 current buffer was displayed in the selected frame. Unfortunately 947 that also means that point gets adjusted in all the buffers, which 948 are being displayed in the selected frame. 949 950 -- Function: magit-mode-quit-window kill-buffer 951 Bury or kill the current buffer using ‘quit-window’, which is 952 called with KILL-BUFFER as first and the selected window as second 953 argument. 954 955 Then, if the window was originally created to display a Magit 956 buffer and the buried buffer was the last remaining Magit buffer 957 that was ever displayed in the window, then that is deleted. 958 959 960 File: magit.info, Node: Automatic Refreshing of Magit Buffers, Next: Automatic Saving of File-Visiting Buffers, Prev: Quitting Windows, Up: Modes and Buffers 961 962 4.1.4 Automatic Refreshing of Magit Buffers 963 ------------------------------------------- 964 965 After running a command which may change the state of the current 966 repository, the current Magit buffer and the corresponding status buffer 967 are refreshed. The status buffer can be automatically refreshed 968 whenever a buffer is saved to a file inside the respective repository by 969 adding a hook, like so: 970 971 (with-eval-after-load 'magit-mode 972 (add-hook 'after-save-hook 'magit-after-save-refresh-status t)) 973 974 Automatically refreshing Magit buffers ensures that the displayed 975 information is up-to-date most of the time but can lead to a noticeable 976 delay in big repositories. Other Magit buffers are not refreshed to 977 keep the delay to a minimum and also because doing so can sometimes be 978 undesirable. 979 980 Buffers can also be refreshed explicitly, which is useful in buffers 981 that weren’t current during the last refresh and after changes were made 982 to the repository outside of Magit. 983 984 ‘g’ (‘magit-refresh’) 985 This command refreshes the current buffer if its major mode derives 986 from ‘magit-mode’ as well as the corresponding status buffer. 987 988 If the option ‘magit-revert-buffers’ calls for it, then it also 989 reverts all unmodified buffers that visit files being tracked in 990 the current repository. 991 992 ‘G’ (‘magit-refresh-all’) 993 This command refreshes all Magit buffers belonging to the current 994 repository and also reverts all unmodified buffers that visit files 995 being tracked in the current repository. 996 997 The file-visiting buffers are always reverted, even if 998 ‘magit-revert-buffers’ is nil. 999 1000 -- User Option: magit-refresh-buffer-hook 1001 This hook is run in each Magit buffer that was refreshed during the 1002 current refresh - normally the current buffer and the status 1003 buffer. 1004 1005 -- User Option: magit-refresh-status-buffer 1006 When this option is non-nil, then the status buffer is 1007 automatically refreshed after running git for side-effects, in 1008 addition to the current Magit buffer, which is always refreshed 1009 automatically. 1010 1011 Only set this to nil after exhausting all other options to improve 1012 performance. 1013 1014 -- Function: magit-after-save-refresh-status 1015 This function is intended to be added to ‘after-save-hook’. After 1016 doing that the corresponding status buffer is refreshed whenever a 1017 buffer is saved to a file inside a repository. 1018 1019 Note that refreshing a Magit buffer is done by re-creating its 1020 contents from scratch, which can be slow in large repositories. If 1021 you are not satisfied with Magit’s performance, then you should 1022 obviously not add this function to that hook. 1023 1024 1025 File: magit.info, Node: Automatic Saving of File-Visiting Buffers, Next: Automatic Reverting of File-Visiting Buffers, Prev: Automatic Refreshing of Magit Buffers, Up: Modes and Buffers 1026 1027 4.1.5 Automatic Saving of File-Visiting Buffers 1028 ----------------------------------------------- 1029 1030 File-visiting buffers are by default saved at certain points in time. 1031 This doesn’t guarantee that Magit buffers are always up-to-date, but, 1032 provided one only edits files by editing them in Emacs and uses only 1033 Magit to interact with Git, one can be fairly confident. When in doubt 1034 or after outside changes, type ‘g’ (‘magit-refresh’) to save and refresh 1035 explicitly. 1036 1037 -- User Option: magit-save-repository-buffers 1038 This option controls whether file-visiting buffers are saved before 1039 certain events. 1040 1041 If this is non-nil then all modified file-visiting buffers 1042 belonging to the current repository may be saved before running 1043 commands, before creating new Magit buffers, and before explicitly 1044 refreshing such buffers. If this is ‘dontask’ then this is done 1045 without user intervention. If it is ‘t’ then the user has to 1046 confirm each save. 1047 1048 1049 File: magit.info, Node: Automatic Reverting of File-Visiting Buffers, Prev: Automatic Saving of File-Visiting Buffers, Up: Modes and Buffers 1050 1051 4.1.6 Automatic Reverting of File-Visiting Buffers 1052 -------------------------------------------------- 1053 1054 By default Magit automatically reverts buffers that are visiting files 1055 that are being tracked in a Git repository, after they have changed on 1056 disk. When using Magit one often changes files on disk by running Git, 1057 i.e., "outside Emacs", making this a rather important feature. 1058 1059 For example, if you discard a change in the status buffer, then that 1060 is done by running ‘git apply --reverse ...’, and Emacs considers the 1061 file to have "changed on disk". If Magit did not automatically revert 1062 the buffer, then you would have to type ‘M-x revert-buffer RET RET’ in 1063 the visiting buffer before you could continue making changes. 1064 1065 -- User Option: magit-auto-revert-mode 1066 When this mode is enabled, then buffers that visit tracked files 1067 are automatically reverted after the visited files change on disk. 1068 1069 -- User Option: global-auto-revert-mode 1070 When this mode is enabled, then any file-visiting buffer is 1071 automatically reverted after the visited file changes on disk. 1072 1073 If you like buffers that visit tracked files to be automatically 1074 reverted, then you might also like any buffer to be reverted, not 1075 just those visiting tracked files. If that is the case, then 1076 enable this mode _instead of_ ‘magit-auto-revert-mode’. 1077 1078 -- User Option: magit-auto-revert-immediately 1079 This option controls whether Magit reverts buffers immediately. 1080 1081 If this is non-nil and either ‘global-auto-revert-mode’ or 1082 ‘magit-auto-revert-mode’ is enabled, then Magit immediately reverts 1083 buffers by explicitly calling ‘auto-revert-buffers’ after running 1084 Git for side-effects. 1085 1086 If ‘auto-revert-use-notify’ is non-nil (and file notifications are 1087 actually supported), then ‘magit-auto-revert-immediately’ does not 1088 have to be non-nil, because the reverts happen immediately anyway. 1089 1090 If ‘magit-auto-revert-immediately’ and ‘auto-revert-use-notify’ are 1091 both ‘nil’, then reverts happen after ‘auto-revert-interval’ 1092 seconds of user inactivity. That is not desirable. 1093 1094 -- User Option: auto-revert-use-notify 1095 This option controls whether file notification functions should be 1096 used. Note that this variable unfortunately defaults to ‘t’ even 1097 on systems on which file notifications cannot be used. 1098 1099 -- User Option: magit-auto-revert-tracked-only 1100 This option controls whether ‘magit-auto-revert-mode’ only reverts 1101 tracked files or all files that are located inside Git 1102 repositories, including untracked files and files located inside 1103 Git’s control directory. 1104 1105 -- User Option: auto-revert-mode 1106 The global mode ‘magit-auto-revert-mode’ works by turning on this 1107 local mode in the appropriate buffers (but 1108 ‘global-auto-revert-mode’ is implemented differently). You can 1109 also turn it on or off manually, which might be necessary if Magit 1110 does not notice that a previously untracked file now is being 1111 tracked or vice-versa. 1112 1113 -- User Option: auto-revert-stop-on-user-input 1114 This option controls whether the arrival of user input suspends the 1115 automatic reverts for ‘auto-revert-interval’ seconds. 1116 1117 -- User Option: auto-revert-interval 1118 This option controls how many seconds Emacs waits for before 1119 resuming suspended reverts. 1120 1121 -- User Option: auto-revert-buffer-list-filter 1122 This option specifies an additional filter used by 1123 ‘auto-revert-buffers’ to determine whether a buffer should be 1124 reverted or not. 1125 1126 This option is provided by Magit, which also advises 1127 ‘auto-revert-buffers’ to respect it. Magit users who do not turn 1128 on the local mode ‘auto-revert-mode’ themselves, are best served by 1129 setting the value to ‘magit-auto-revert-repository-buffer-p’. 1130 1131 However the default is nil, so as not to disturb users who do use 1132 the local mode directly. If you experience delays when running 1133 Magit commands, then you should consider using one of the 1134 predicates provided by Magit - especially if you also use Tramp. 1135 1136 Users who do turn on ‘auto-revert-mode’ in buffers in which Magit 1137 doesn’t do that for them, should likely not use any filter. Users 1138 who turn on ‘global-auto-revert-mode’, do not have to worry about 1139 this option, because it is disregarded if the global mode is 1140 enabled. 1141 1142 -- User Option: auto-revert-verbose 1143 This option controls whether Emacs reports when a buffer has been 1144 reverted. 1145 1146 The options with the ‘auto-revert-’ prefix are located in the Custom 1147 group named ‘auto-revert’. The other, Magit-specific, options are 1148 located in the ‘magit’ group. 1149 1150 * Menu: 1151 1152 * Risk of Reverting Automatically:: 1153 1154 1155 File: magit.info, Node: Risk of Reverting Automatically, Up: Automatic Reverting of File-Visiting Buffers 1156 1157 Risk of Reverting Automatically 1158 ............................... 1159 1160 For the vast majority of users, automatically reverting file-visiting 1161 buffers after they have changed on disk is harmless. 1162 1163 If a buffer is modified (i.e., it contains changes that haven’t been 1164 saved yet), then Emacs will refuse to automatically revert it. If you 1165 save a previously modified buffer, then that results in what is seen by 1166 Git as an uncommitted change. Git will then refuse to carry out any 1167 commands that would cause these changes to be lost. In other words, if 1168 there is anything that could be lost, then either Git or Emacs will 1169 refuse to discard the changes. 1170 1171 However, if you use file-visiting buffers as a sort of ad hoc 1172 "staging area", then the automatic reverts could potentially cause data 1173 loss. So far I have heard from only one user who uses such a workflow. 1174 1175 An example: You visit some file in a buffer, edit it, and save the 1176 changes. Then, outside of Emacs (or at least not using Magit or by 1177 saving the buffer) you change the file on disk again. At this point the 1178 buffer is the only place where the intermediate version still exists. 1179 You have saved the changes to disk, but that has since been overwritten. 1180 Meanwhile Emacs considers the buffer to be unmodified (because you have 1181 not made any changes to it since you last saved it to the visited file) 1182 and therefore would not object to it being automatically reverted. At 1183 this point an Auto-Revert mode would kick in. It would check whether 1184 the buffer is modified and since that is not the case it would revert 1185 it. The intermediate version would be lost. (Actually you could still 1186 get it back using the ‘undo’ command.) 1187 1188 If your workflow depends on Emacs preserving the intermediate version 1189 in the buffer, then you have to disable all Auto-Revert modes. But 1190 please consider that such a workflow would be dangerous even without 1191 using an Auto-Revert mode, and should therefore be avoided. If Emacs 1192 crashes or if you quit Emacs by mistake, then you would also lose the 1193 buffer content. There would be no autosave file still containing the 1194 intermediate version (because that was deleted when you saved the 1195 buffer) and you would not be asked whether you want to save the buffer 1196 (because it isn’t modified). 1197 1198 1199 File: magit.info, Node: Sections, Next: Transient Commands, Prev: Modes and Buffers, Up: Interface Concepts 1200 1201 4.2 Sections 1202 ============ 1203 1204 Magit buffers are organized into nested sections, which can be collapsed 1205 and expanded, similar to how sections are handled in Org mode. Each 1206 section also has a type, and some sections also have a value. For each 1207 section type there can also be a local keymap, shared by all sections of 1208 that type. 1209 1210 Taking advantage of the section value and type, many commands operate 1211 on the current section, or when the region is active and selects 1212 sections of the same type, all of the selected sections. Commands that 1213 only make sense for a particular section type (as opposed to just 1214 behaving differently depending on the type) are usually bound in section 1215 type keymaps. 1216 1217 * Menu: 1218 1219 * Section Movement:: 1220 * Section Visibility:: 1221 * Section Hooks:: 1222 * Section Types and Values:: 1223 * Section Options:: 1224 1225 1226 File: magit.info, Node: Section Movement, Next: Section Visibility, Up: Sections 1227 1228 4.2.1 Section Movement 1229 ---------------------- 1230 1231 To move within a section use the usual keys (‘C-p’, ‘C-n’, ‘C-b’, ‘C-f’ 1232 etc), whose global bindings are not shadowed. To move to another 1233 section use the following commands. 1234 1235 ‘p’ (‘magit-section-backward’) 1236 When not at the beginning of a section, then move to the beginning 1237 of the current section. At the beginning of a section, instead 1238 move to the beginning of the previous visible section. 1239 1240 ‘n’ (‘magit-section-forward’) 1241 Move to the beginning of the next visible section. 1242 1243 ‘M-p’ (‘magit-section-backward-siblings’) 1244 Move to the beginning of the previous sibling section. If there is 1245 no previous sibling section, then move to the parent section 1246 instead. 1247 1248 ‘M-n’ (‘magit-section-forward-siblings’) 1249 Move to the beginning of the next sibling section. If there is no 1250 next sibling section, then move to the parent section instead. 1251 1252 ‘^’ (‘magit-section-up’) 1253 Move to the beginning of the parent of the current section. 1254 1255 The above commands all call the hook ‘magit-section-movement-hook’. 1256 Any of the functions listed below can be used as members of this hook. 1257 1258 You might want to remove some of the functions that Magit adds using 1259 ‘add-hook’. In doing so you have to make sure you do not attempt to 1260 remove function that haven’t even been added yet, for example: 1261 1262 (with-eval-after-load 'magit-diff 1263 (remove-hook 'magit-section-movement-hook 1264 'magit-hunk-set-window-start)) 1265 1266 -- Variable: magit-section-movement-hook 1267 This hook is run by all of the above movement commands, after 1268 arriving at the destination. 1269 1270 -- Function: magit-hunk-set-window-start 1271 This hook function ensures that the beginning of the current 1272 section is visible, provided it is a ‘hunk’ section. Otherwise, it 1273 does nothing. 1274 1275 Loading ‘magit-diff’ adds this function to the hook. 1276 1277 -- Function: magit-section-set-window-start 1278 This hook function ensures that the beginning of the current 1279 section is visible, regardless of the section’s type. If you add 1280 this to ‘magit-section-movement-hook’, then you must remove the 1281 hunk-only variant in turn. 1282 1283 -- Function: magit-log-maybe-show-more-commits 1284 This hook function only has an effect in log buffers, and ‘point’ 1285 is on the "show more" section. If that is the case, then it 1286 doubles the number of commits that are being shown. 1287 1288 Loading ‘magit-log’ adds this function to the hook. 1289 1290 -- Function: magit-log-maybe-update-revision-buffer 1291 When moving inside a log buffer, then this function updates the 1292 revision buffer, provided it is already being displayed in another 1293 window of the same frame. 1294 1295 Loading ‘magit-log’ adds this function to the hook. 1296 1297 -- Function: magit-log-maybe-update-blob-buffer 1298 When moving inside a log buffer and another window of the same 1299 frame displays a blob buffer, then this function instead displays 1300 the blob buffer for the commit at point in that window. 1301 1302 -- Function: magit-status-maybe-update-revision-buffer 1303 When moving inside a status buffer, then this function updates the 1304 revision buffer, provided it is already being displayed in another 1305 window of the same frame. 1306 1307 -- Function: magit-status-maybe-update-stash-buffer 1308 When moving inside a status buffer, then this function updates the 1309 stash buffer, provided it is already being displayed in another 1310 window of the same frame. 1311 1312 -- Function: magit-status-maybe-update-blob-buffer 1313 When moving inside a status buffer and another window of the same 1314 frame displays a blob buffer, then this function instead displays 1315 the blob buffer for the commit at point in that window. 1316 1317 -- Function: magit-stashes-maybe-update-stash-buffer 1318 When moving inside a buffer listing stashes, then this function 1319 updates the stash buffer, provided it is already being displayed in 1320 another window of the same frame. 1321 1322 -- User Option: magit-update-other-window-delay 1323 Delay before automatically updating the other window. 1324 1325 When moving around in certain buffers, then certain other buffers, 1326 which are being displayed in another window, may optionally be 1327 updated to display information about the section at point. 1328 1329 When holding down a key to move by more than just one section, then 1330 that would update that buffer for each section on the way. To 1331 prevent that, updating the revision buffer is delayed, and this 1332 option controls for how long. For optimal experience you might 1333 have to adjust this delay and/or the keyboard repeat rate and delay 1334 of your graphical environment or operating system. 1335 1336 1337 File: magit.info, Node: Section Visibility, Next: Section Hooks, Prev: Section Movement, Up: Sections 1338 1339 4.2.2 Section Visibility 1340 ------------------------ 1341 1342 Magit provides many commands for changing the visibility of sections, 1343 but all you need to get started are the next two. 1344 1345 ‘<TAB>’ (‘magit-section-toggle’) 1346 Toggle the visibility of the body of the current section. 1347 1348 ‘C-c <TAB>’ (‘magit-section-cycle’) 1349 ‘C-<tab>’ (‘magit-section-cycle’) 1350 Cycle the visibility of current section and its children. 1351 1352 If this command is invoked using ‘C-<tab>’ and that is globally 1353 bound to ‘tab-next’, then this command pivots to behave like that 1354 command, and you must instead use ‘C-c TAB’ to cycle section 1355 visibility. 1356 1357 If you would like to keep using ‘C-<tab>’ to cycle section 1358 visibility but also want to use ‘tab-bar-mode’, then you have to 1359 prevent that mode from using this key and instead bind another key 1360 to ‘tab-next’. Because ‘tab-bar-mode’ does not use a mode map but 1361 instead manipulates the global map, this involves advising 1362 ‘tab-bar--define-keys’. 1363 1364 ‘M-<tab>’ (‘magit-section-cycle-diffs’) 1365 Cycle the visibility of diff-related sections in the current 1366 buffer. 1367 1368 ‘S-<tab>’ (‘magit-section-cycle-global’) 1369 Cycle the visibility of all sections in the current buffer. 1370 1371 ‘1’ (‘magit-section-show-level-1’) 1372 ‘2’ (‘magit-section-show-level-2’) 1373 ‘3’ (‘magit-section-show-level-3’) 1374 ‘4’ (‘magit-section-show-level-4’) 1375 Show sections surrounding the current section up to level N. 1376 1377 ‘M-1’ (‘magit-section-show-level-1-all’) 1378 ‘M-2’ (‘magit-section-show-level-2-all’) 1379 ‘M-3’ (‘magit-section-show-level-3-all’) 1380 ‘M-4’ (‘magit-section-show-level-4-all’) 1381 Show all sections up to level N. 1382 1383 Some functions, which are used to implement the above commands, are 1384 also exposed as commands themselves. By default no keys are bound to 1385 these commands, as they are generally perceived to be much less useful. 1386 But your mileage may vary. 1387 1388 -- Command: magit-section-show 1389 Show the body of the current section. 1390 1391 -- Command: magit-section-hide 1392 Hide the body of the current section. 1393 1394 -- Command: magit-section-show-headings 1395 Recursively show headings of children of the current section. Only 1396 show the headings. Previously shown text-only bodies are hidden. 1397 1398 -- Command: magit-section-show-children 1399 Recursively show the bodies of children of the current section. 1400 With a prefix argument show children down to the level of the 1401 current section, and hide deeper children. 1402 1403 -- Command: magit-section-hide-children 1404 Recursively hide the bodies of children of the current section. 1405 1406 -- Command: magit-section-toggle-children 1407 Toggle visibility of bodies of children of the current section. 1408 1409 When a buffer is first created then some sections are shown expanded 1410 while others are not. This is hard coded. When a buffer is refreshed 1411 then the previous visibility is preserved. The initial visibility of 1412 certain sections can also be overwritten using the hook 1413 ‘magit-section-set-visibility-hook’. 1414 1415 -- User Option: magit-section-initial-visibility-alist 1416 This options can be used to override the initial visibility of 1417 sections. In the future it will also be used to define the 1418 defaults, but currently a section’s default is still hardcoded. 1419 1420 The value is an alist. Each element maps a section type or lineage 1421 to the initial visibility state for such sections. The state has 1422 to be one of ‘show’ or ‘hide’, or a function that returns one of 1423 these symbols. A function is called with the section as the only 1424 argument. 1425 1426 Use the command ‘magit-describe-section-briefly’ to determine a 1427 section’s lineage or type. The vector in the output is the section 1428 lineage and the type is the first element of that vector. 1429 Wildcards can be used, see ‘magit-section-match’. 1430 1431 -- User Option: magit-section-cache-visibility 1432 This option controls for which sections the previous visibility 1433 state should be restored if a section disappears and later appears 1434 again. The value is a boolean or a list of section types. If t, 1435 then the visibility of all sections is cached. Otherwise this is 1436 only done for sections whose type matches one of the listed types. 1437 1438 This requires that the function ‘magit-section-cached-visibility’ 1439 is a member of ‘magit-section-set-visibility-hook’. 1440 1441 -- Variable: magit-section-set-visibility-hook 1442 This hook is run when first creating a buffer and also when 1443 refreshing an existing buffer, and is used to determine the 1444 visibility of the section currently being inserted. 1445 1446 Each function is called with one argument, the section being 1447 inserted. It should return ‘hide’ or ‘show’, or to leave the 1448 visibility undefined ‘nil’. If no function decides on the 1449 visibility and the buffer is being refreshed, then the visibility 1450 is preserved; or if the buffer is being created, then the hard 1451 coded default is used. 1452 1453 Usually this should only be used to set the initial visibility but 1454 not during refreshes. If ‘magit-insert-section--oldroot’ is 1455 non-nil, then the buffer is being refreshed and these functions 1456 should immediately return ‘nil’. 1457 1458 -- User Option: magit-section-visibility-indicator 1459 This option controls whether and how to indicate that a section can 1460 be expanded/collapsed. 1461 1462 If nil, then no visibility indicators are shown. Otherwise the 1463 value has to have one of these two forms: 1464 1465 • ‘(EXPANDABLE-BITMAP . COLLAPSIBLE-BITMAP)’ 1466 1467 Both values have to be variables whose values are fringe 1468 bitmaps. In this case every section that can be expanded or 1469 collapsed gets an indicator in the left fringe. 1470 1471 To provide extra padding around the indicator, set 1472 ‘left-fringe-width’ in ‘magit-mode-hook’, e.g.: 1473 1474 (add-hook 'magit-mode-hook (lambda () 1475 (setq left-fringe-width 20))) 1476 1477 • ‘(STRING . BOOLEAN)’ 1478 1479 In this case STRING (usually an ellipsis) is shown at the end 1480 of the heading of every collapsed section. Expanded sections 1481 get no indicator. The cdr controls whether the appearance of 1482 these ellipsis take section highlighting into account. Doing 1483 so might potentially have an impact on performance, while not 1484 doing so is kinda ugly. 1485 1486 1487 File: magit.info, Node: Section Hooks, Next: Section Types and Values, Prev: Section Visibility, Up: Sections 1488 1489 4.2.3 Section Hooks 1490 ------------------- 1491 1492 Which sections are inserted into certain buffers is controlled with 1493 hooks. This includes the status and the refs buffers. For other 1494 buffers, e.g., log and diff buffers, this is not possible. The command 1495 ‘magit-describe-section’ can be used to see which hook (if any) was 1496 responsible for inserting the section at point. 1497 1498 For buffers whose sections can be customized by the user, a hook 1499 variable called ‘magit-TYPE-sections-hook’ exists. This hook should be 1500 changed using ‘magit-add-section-hook’. Avoid using ‘add-hooks’ or the 1501 Custom interface. 1502 1503 The various available section hook variables are described later in 1504 this manual along with the appropriate "section inserter functions". 1505 1506 -- Function: magit-add-section-hook hook function &optional at append 1507 local 1508 Add the function FUNCTION to the value of section hook HOOK. 1509 1510 Add FUNCTION at the beginning of the hook list unless optional 1511 APPEND is non-nil, in which case FUNCTION is added at the end. If 1512 FUNCTION already is a member then move it to the new location. 1513 1514 If optional AT is non-nil and a member of the hook list, then add 1515 FUNCTION next to that instead. Add before or after AT, or replace 1516 AT with FUNCTION depending on APPEND. If APPEND is the symbol 1517 ‘replace’, then replace AT with FUNCTION. For any other non-nil 1518 value place FUNCTION right after AT. If nil, then place FUNCTION 1519 right before AT. If FUNCTION already is a member of the list but 1520 AT is not, then leave FUNCTION where ever it already is. 1521 1522 If optional LOCAL is non-nil, then modify the hook’s buffer-local 1523 value rather than its global value. This makes the hook local by 1524 copying the default value. That copy is then modified. 1525 1526 HOOK should be a symbol. If HOOK is void, it is first set to nil. 1527 HOOK’s value must not be a single hook function. FUNCTION should 1528 be a function that takes no arguments and inserts one or multiple 1529 sections at point, moving point forward. FUNCTION may choose not 1530 to insert its section(s), when doing so would not make sense. It 1531 should not be abused for other side-effects. 1532 1533 To remove a function from a section hook, use ‘remove-hook’. 1534 1535 1536 File: magit.info, Node: Section Types and Values, Next: Section Options, Prev: Section Hooks, Up: Sections 1537 1538 4.2.4 Section Types and Values 1539 ------------------------------ 1540 1541 Each section has a type, for example ‘hunk’, ‘file’, and ‘commit’. 1542 Instances of certain section types also have a value. The value of a 1543 section of type ‘file’, for example, is a file name. 1544 1545 Users usually do not have to worry about a section’s type and value, 1546 but knowing them can be handy at times. 1547 1548 ‘H’ (‘magit-describe-section’) 1549 This command shows information about the section at point in a 1550 separate buffer. 1551 1552 -- Command: magit-describe-section-briefly 1553 This command shows information about the section at point in the 1554 echo area, as ‘#<magit-section VALUE [TYPE PARENT-TYPE...] 1555 BEGINNING-END>’. 1556 1557 Many commands behave differently depending on the type of the section 1558 at point and/or somehow consume the value of that section. But that is 1559 only one of the reasons why the same key may do something different, 1560 depending on what section is current. 1561 1562 Additionally for each section type a keymap *might* be defined, named 1563 ‘magit-TYPE-section-map’. That keymap is used as text property keymap 1564 of all text belonging to any section of the respective type. If such a 1565 map does not exist for a certain type, then you can define it yourself, 1566 and it will automatically be used. 1567 1568 1569 File: magit.info, Node: Section Options, Prev: Section Types and Values, Up: Sections 1570 1571 4.2.5 Section Options 1572 --------------------- 1573 1574 This section describes options that have an effect on more than just a 1575 certain type of sections. As you can see there are not many of those. 1576 1577 -- User Option: magit-section-show-child-count 1578 Whether to append the number of children to section headings. This 1579 only affects sections that could benefit from this information. 1580 1581 1582 File: magit.info, Node: Transient Commands, Next: Transient Arguments and Buffer Variables, Prev: Sections, Up: Interface Concepts 1583 1584 4.3 Transient Commands 1585 ====================== 1586 1587 Many Magit commands are implemented as *transient* commands. First the 1588 user invokes a *prefix* command, which causes its *infix* arguments and 1589 *suffix* commands to be displayed in the echo area. The user then 1590 optionally sets some infix arguments and finally invokes one of the 1591 suffix commands. 1592 1593 This is implemented in the library ‘transient’. Earlier Magit 1594 releases used the package ‘magit-popup’ and even earlier versions 1595 library ‘magit-key-mode’. 1596 1597 Transient is documented in *note (transient)Top::. 1598 1599 ‘C-x M-g’ (‘magit-dispatch’) 1600 ‘C-c g’ (‘magit-dispatch’) 1601 This transient prefix command binds most of Magit’s other prefix 1602 commands as suffix commands and displays them in a temporary buffer 1603 until one of them is invoked. Invoking such a sub-prefix causes 1604 the suffixes of that command to be bound and displayed instead of 1605 those of ‘magit-dispatch’. 1606 1607 This command is also, or especially, useful outside Magit buffers, 1608 so Magit by default binds it to ‘C-c M-g’ in the global keymap. 1609 ‘C-c g’ would be a better binding, but we cannot use that by 1610 default, because that key sequence is reserved for the user. See 1611 *note Global Bindings:: to learn more default and recommended key 1612 bindings. 1613 1614 1615 File: magit.info, Node: Transient Arguments and Buffer Variables, Next: Completion Confirmation and the Selection, Prev: Transient Commands, Up: Interface Concepts 1616 1617 4.4 Transient Arguments and Buffer Variables 1618 ============================================ 1619 1620 The infix arguments of many of Magit’s transient prefix commands cease 1621 to have an effect once the ‘git’ command that is called with those 1622 arguments has returned. Commands that create a commit are a good 1623 example for this. If the user changes the arguments, then that only 1624 affects the next invocation of a suffix command. If the same transient 1625 prefix command is later invoked again, then the arguments are initially 1626 reset to the default value. This default value can be set for the 1627 current Emacs session or saved permanently, see *note (transient)Saving 1628 Values::. It is also possible to cycle through previously used sets of 1629 arguments using ‘C-M-p’ and ‘C-M-n’, see *note (transient)Using 1630 History::. 1631 1632 However the infix arguments of many other transient commands continue 1633 to have an effect even after the ‘git’ command that was called with 1634 those arguments has returned. The most important commands like this are 1635 those that display a diff or log in a dedicated buffer. Their arguments 1636 obviously continue to have an effect for as long as the respective diff 1637 or log is being displayed. Furthermore the used arguments are stored in 1638 buffer-local variables for future reference. 1639 1640 For commands in the second group it isn’t always desirable to reset 1641 their arguments to the global value when the transient prefix command is 1642 invoked again. 1643 1644 As mentioned above, it is possible to cycle through previously used 1645 sets of arguments while a transient popup is visible. That means that 1646 we could always reset the infix arguments to the default because the set 1647 of arguments that is active in the existing buffer is only a few ‘C-M-p’ 1648 away. Magit can be configured to behave like that, but because I expect 1649 that most users would not find that very convenient, it is not the 1650 default. 1651 1652 Also note that it is possible to change the diff and log arguments 1653 used in the current buffer (including the status buffer, which contains 1654 both diff and log sections) using the respective "refresh" transient 1655 prefix commands on ‘D’ and ‘L’. (‘d’ and ‘l’ on the other hand are 1656 intended to change *what* diff or log is being displayed. It is 1657 possible to also change *how* the diff or log is being displayed at the 1658 same time, but if you only want to do the latter, then you should use 1659 the refresh variants.) Because these secondary diff and log transient 1660 prefixes are about *changing* the arguments used in the current buffer, 1661 they *always* start out with the set of arguments that are currently in 1662 effect in that buffer. 1663 1664 Some commands are usually invoked directly even though they can also 1665 be invoked as the suffix of a transient prefix command. Most 1666 prominently ‘magit-show-commit’ is usually invoked by typing ‘RET’ while 1667 point is on a commit in a log, but it can also be invoked from the 1668 ‘magit-diff’ transient prefix. 1669 1670 When such a command is invoked directly, then it is important to 1671 reuse the arguments as specified by the respective buffer-local values, 1672 instead of using the default arguments. Imagine you press ‘RET’ in a 1673 log to display the commit at point in a different buffer and then use 1674 ‘D’ to change how the diff is displayed in that buffer. And then you 1675 press ‘RET’ on another commit to show that instead and the diff 1676 arguments are reset to the default. Not cool; so Magit does not do that 1677 by default. 1678 1679 -- User Option: magit-prefix-use-buffer-arguments 1680 This option controls whether the infix arguments initially shown in 1681 certain transient prefix commands are based on the arguments that 1682 are currently in effect in the buffer that their suffixes update. 1683 1684 The ‘magit-diff’ and ‘magit-log’ transient prefix commands are 1685 affected by this option. 1686 1687 -- User Option: magit-direct-use-buffer-arguments 1688 This option controls whether certain commands, when invoked 1689 directly (i.e., not as the suffix of a transient prefix command), 1690 use the arguments that are currently active in the buffer that they 1691 are about to update. The alternative is to use the default value 1692 for these arguments, which might change the arguments that are used 1693 in the buffer. 1694 1695 Valid values for both of the above options are: 1696 1697 • ‘always’: Always use the set of arguments that is currently active 1698 in the respective buffer, provided that buffer exists of course. 1699 • ‘selected’ or ‘t’: Use the set of arguments from the respective 1700 buffer, but only if it is displayed in a window of the current 1701 frame. This is the default for both variables. 1702 • ‘current’: Use the set of arguments from the respective buffer, but 1703 only if it is the current buffer. 1704 • ‘never’: Never use the set of arguments from the respective buffer. 1705 1706 I am afraid it gets more complicated still: 1707 1708 • The global diff and log arguments are set for each supported mode 1709 individually. The diff arguments for example have different values 1710 in ‘magit-diff-mode’, ‘magit-revision-mode’, 1711 ‘magit-merge-preview-mode’ and ‘magit-status-mode’ buffers. 1712 Setting or saving the value for one mode does not change the value 1713 for other modes. The history however is shared. 1714 1715 • When ‘magit-show-commit’ is invoked directly from a log buffer, 1716 then the file filter is picked up from that buffer, not from the 1717 revision buffer or the mode’s global diff arguments. 1718 1719 • Even though they are suffixes of the diff prefix 1720 ‘magit-show-commit’ and ‘magit-stash-show’ do not use the diff 1721 buffer used by the diff commands, instead they use the dedicated 1722 revision and stash buffers. 1723 1724 At the time you invoke the diff prefix it is unknown to Magit which 1725 of the suffix commands you are going to invoke. While not certain, 1726 more often than not users invoke one of the commands that use the 1727 diff buffer, so the initial infix arguments are those used in that 1728 buffer. However if you invoke one of these commands directly, then 1729 Magit knows that it should use the arguments from the revision 1730 resp. stash buffer. 1731 1732 • The log prefix also features reflog commands, but these commands do 1733 not use the log arguments. 1734 1735 • If ‘magit-show-refs’ is invoked from a ‘magit-refs-mode’ buffer, 1736 then it acts as a refresh prefix and therefore unconditionally uses 1737 the buffer’s arguments as initial arguments. If it is invoked 1738 elsewhere with a prefix argument, then it acts as regular prefix 1739 and therefore respects ‘magit-prefix-use-buffer-arguments’. If it 1740 is invoked elsewhere without a prefix argument, then it acts as a 1741 direct command and therefore respects 1742 ‘magit-direct-use-buffer-arguments’. 1743 1744 1745 File: magit.info, Node: Completion Confirmation and the Selection, Next: Mouse Support, Prev: Transient Arguments and Buffer Variables, Up: Interface Concepts 1746 1747 4.5 Completion, Confirmation and the Selection 1748 ============================================== 1749 1750 * Menu: 1751 1752 * Action Confirmation:: 1753 * Completion and Confirmation:: 1754 * The Selection:: 1755 * The hunk-internal region:: 1756 * Support for Completion Frameworks:: 1757 * Additional Completion Options:: 1758 1759 1760 File: magit.info, Node: Action Confirmation, Next: Completion and Confirmation, Up: Completion Confirmation and the Selection 1761 1762 4.5.1 Action Confirmation 1763 ------------------------- 1764 1765 By default many actions that could potentially lead to data loss have to 1766 be confirmed. This includes many very common actions, so this can 1767 quickly become annoying. Many of these actions can be undone and if you 1768 have thought about how to undo certain mistakes, then it should be safe 1769 to disable confirmation for the respective actions. 1770 1771 The option ‘magit-no-confirm’ can be used to tell Magit to perform 1772 certain actions without the user having to confirm them. Note that 1773 while this option can only be used to disable confirmation for a 1774 specific set of actions, the next section explains another way of 1775 telling Magit to ask fewer questions. 1776 1777 -- User Option: magit-no-confirm 1778 The value of this option is a list of symbols, representing actions 1779 that do not have to be confirmed by the user before being carried 1780 out. 1781 1782 By default many potentially dangerous commands ask the user for 1783 confirmation. Each of the below symbols stands for an action 1784 which, when invoked unintentionally or without being fully aware of 1785 the consequences, could lead to tears. In many cases there are 1786 several commands that perform variations of a certain action, so we 1787 don’t use the command names but more generic symbols. 1788 1789 • Applying changes: 1790 1791 • ‘discard’ Discarding one or more changes (i.e., hunks or 1792 the complete diff for a file) loses that change, 1793 obviously. 1794 1795 • ‘reverse’ Reverting one or more changes can usually be 1796 undone by reverting the reversion. 1797 1798 • ‘stage-all-changes’, ‘unstage-all-changes’ When there are 1799 both staged and unstaged changes, then un-/staging 1800 everything would destroy that distinction. Of course 1801 that also applies when un-/staging a single change, but 1802 then less is lost and one does that so often that having 1803 to confirm every time would be unacceptable. 1804 1805 • Files: 1806 1807 • ‘delete’ When a file that isn’t yet tracked by Git is 1808 deleted, then it is completely lost, not just the last 1809 changes. Very dangerous. 1810 1811 • ‘trash’ Instead of deleting a file it can also be move to 1812 the system trash. Obviously much less dangerous than 1813 deleting it. 1814 1815 Also see option ‘magit-delete-by-moving-to-trash’. 1816 1817 • ‘resurrect’ A deleted file can easily be resurrected by 1818 "deleting" the deletion, which is done using the same 1819 command that was used to delete the same file in the 1820 first place. 1821 1822 • ‘untrack’ Untracking a file can be undone by tracking it 1823 again. 1824 1825 • ‘rename’ Renaming a file can easily be undone. 1826 1827 • Sequences: 1828 1829 • ‘reset-bisect’ Aborting (known to Git as "resetting") a 1830 bisect operation loses all information collected so far. 1831 1832 • ‘abort-cherry-pick’ Aborting a cherry-pick throws away 1833 all conflict resolutions which have already been carried 1834 out by the user. 1835 1836 • ‘abort-revert’ Aborting a revert throws away all conflict 1837 resolutions which have already been carried out by the 1838 user. 1839 1840 • ‘abort-rebase’ Aborting a rebase throws away all already 1841 modified commits, but it’s possible to restore those from 1842 the reflog. 1843 1844 • ‘abort-merge’ Aborting a merge throws away all conflict 1845 resolutions which have already been carried out by the 1846 user. 1847 1848 • ‘merge-dirty’ Merging with a dirty worktree can make it 1849 hard to go back to the state before the merge was 1850 initiated. 1851 1852 • References: 1853 1854 • ‘delete-unmerged-branch’ Once a branch has been deleted, 1855 it can only be restored using low-level recovery tools 1856 provided by Git. And even then the reflog is gone. The 1857 user always has to confirm the deletion of a branch by 1858 accepting the default choice (or selecting another 1859 branch), but when a branch has not been merged yet, also 1860 make sure the user is aware of that. 1861 1862 • ‘delete-pr-remote’ When deleting a branch that was 1863 created from a pull-request and if no other branches 1864 still exist on that remote, then ‘magit-branch-delete’ 1865 offers to delete the remote as well. This should be safe 1866 because it only happens if no other refs exist in the 1867 remotes namespace, and you can recreate the remote if 1868 necessary. 1869 1870 • ‘drop-stashes’ Dropping a stash is dangerous because Git 1871 stores stashes in the reflog. Once a stash is removed, 1872 there is no going back without using low-level recovery 1873 tools provided by Git. When a single stash is dropped, 1874 then the user always has to confirm by accepting the 1875 default (or selecting another). This action only 1876 concerns the deletion of multiple stashes at once. 1877 1878 • Publishing: 1879 1880 • ‘set-and-push’ When pushing to the upstream or the 1881 push-remote and that isn’t actually configured yet, then 1882 the user can first set the target. If s/he confirms the 1883 default too quickly, then s/he might end up pushing to 1884 the wrong branch and if the remote repository is 1885 configured to disallow fixing such mistakes, then that 1886 can be quite embarrassing and annoying. 1887 1888 • Edit published history: 1889 1890 Without adding these symbols here, you will be warned before 1891 editing commits that have already been pushed to one of the 1892 branches listed in ‘magit-published-branches’. 1893 1894 • ‘amend-published’ Affects most commands that amend to 1895 "HEAD". 1896 1897 • ‘rebase-published’ Affects commands that perform 1898 interactive rebases. This includes commands from the 1899 commit transient that modify a commit other than "HEAD", 1900 namely the various fixup and squash variants. 1901 1902 • ‘edit-published’ Affects the commands 1903 ‘magit-edit-line-commit’ and 1904 ‘magit-diff-edit-hunk-commit’. These two commands make 1905 it quite easy to accidentally edit a published commit, so 1906 you should think twice before configuring them not to ask 1907 for confirmation. 1908 1909 To disable confirmation completely, add all three symbols here 1910 or set ‘magit-published-branches’ to ‘nil’. 1911 1912 • Various: 1913 1914 • ‘stash-apply-3way’ When a stash cannot be applied using 1915 ‘git stash apply’, then Magit uses ‘git apply’ instead, 1916 possibly using the ‘--3way’ argument, which isn’t always 1917 perfectly safe. See also ‘magit-stash-apply’. 1918 1919 • ‘kill-process’ There seldom is a reason to kill a 1920 process. 1921 1922 • Global settings: 1923 1924 Instead of adding all of the above symbols to the value of 1925 this option, you can also set it to the atom ‘t’, which has 1926 the same effect as adding all of the above symbols. Doing 1927 that most certainly is a bad idea, especially because other 1928 symbols might be added in the future. So even if you don’t 1929 want to be asked for confirmation for any of these actions, 1930 you are still better of adding all of the respective symbols 1931 individually. 1932 1933 When ‘magit-wip-before-change-mode’ is enabled, then the 1934 following actions can be undone fairly easily: ‘discard’, 1935 ‘reverse’, ‘stage-all-changes’, and ‘unstage-all-changes’. If 1936 and only if this mode is enabled, then ‘safe-with-wip’ has the 1937 same effect as adding all of these symbols individually. 1938 1939 1940 File: magit.info, Node: Completion and Confirmation, Next: The Selection, Prev: Action Confirmation, Up: Completion Confirmation and the Selection 1941 1942 4.5.2 Completion and Confirmation 1943 --------------------------------- 1944 1945 Many Magit commands ask the user to select from a list of possible 1946 things to act on, while offering the most likely choice as the default. 1947 For many of these commands the default is the thing at point, provided 1948 that it actually is a valid thing to act on. For many commands that act 1949 on a branch, the current branch serves as the default if there is no 1950 branch at point. 1951 1952 These commands combine asking for confirmation and asking for a 1953 target to act on into a single action. The user can confirm the default 1954 target using ‘RET’ or abort using ‘C-g’. This is similar to a 1955 ‘y-or-n-p’ prompt, but the keys to confirm or abort differ. 1956 1957 At the same time the user is also given the opportunity to select 1958 another target, which is useful because for some commands and/or in some 1959 situations you might want to select the action before selecting the 1960 target by moving to it. 1961 1962 However you might find that for some commands you always want to use 1963 the default target, if any, or even that you want the command to act on 1964 the default without requiring any confirmation at all. The option 1965 ‘magit-dwim-selection’ can be used to configure certain commands to that 1966 effect. 1967 1968 Note that when the region is active then many commands act on the 1969 things that are selected using a mechanism based on the region, in many 1970 cases after asking for confirmation. This region-based mechanism is 1971 called the "selection" and is described in detail in the next section. 1972 When a selection exists that is valid for the invoked command, then that 1973 command never offers to act on something else, and whether it asks for 1974 confirmation is not controlled by this option. 1975 1976 Also note that Magit asks for confirmation of certain actions that 1977 are not coupled with completion (or the selection). Such dialogs are 1978 also not affected by this option and are described in the previous 1979 section. 1980 1981 -- User Option: magit-dwim-selection 1982 This option can be used to tell certain commands to use the thing at 1983 point instead of asking the user to select a candidate to act on, with 1984 or without confirmation. 1985 1986 The value has the form ‘((COMMAND nil|PROMPT DEFAULT)...)’. 1987 1988 • COMMAND is the command that should not prompt for a choice. To 1989 have an effect, the command has to use the function 1990 ‘magit-completing-read’ or a utility function which in turn uses 1991 that function. 1992 1993 • If the command uses ‘magit-completing-read’ multiple times, then 1994 PROMPT can be used to only affect one of these uses. PROMPT, if 1995 non-nil, is a regular expression that is used to match against the 1996 PROMPT argument passed to ‘magit-completing-read’. 1997 1998 • DEFAULT specifies how to use the default. If it is ‘t’, then the 1999 DEFAULT argument passed to ‘magit-completing-read’ is used without 2000 confirmation. If it is ‘ask’, then the user is given a chance to 2001 abort. DEFAULT can also be ‘nil’, in which case the entry has no 2002 effect. 2003 2004 2005 File: magit.info, Node: The Selection, Next: The hunk-internal region, Prev: Completion and Confirmation, Up: Completion Confirmation and the Selection 2006 2007 4.5.3 The Selection 2008 ------------------- 2009 2010 If the region is active, then many Magit commands act on the things that 2011 are selected using a mechanism based on the region instead of one single 2012 thing. When the region is not active, then these commands act on the 2013 thing at point or read a single thing to act on. This is described in 2014 the previous section — this section only covers how multiple things are 2015 selected, how that is visualized, and how certain commands behave when 2016 that is the case. 2017 2018 Magit’s mechanism for selecting multiple things, or rather sections 2019 that represent these things, is based on the Emacs region, but the area 2020 that Magit considers to be selected is typically larger than the region 2021 and additional restrictions apply. 2022 2023 Magit makes a distinction between a region that qualifies as forming 2024 a valid Magit selection and a region that does not. If the region does 2025 not qualify, then it is displayed as it is in other Emacs buffers. If 2026 the region does qualify as a Magit selection, then the selection is 2027 always visualized, while the region itself is only visualized if it 2028 begins and ends on the same line. 2029 2030 For a region to qualify as a Magit selection, it must begin in the 2031 heading of one section and end in the heading of a sibling section. 2032 Note that if the end of the region is at the very beginning of section 2033 heading (i.e., at the very beginning of a line) then that section is 2034 considered to be *inside* the selection. 2035 2036 This is not consistent with how the region is normally treated in 2037 Emacs — if the region ends at the beginning of a line, then that line is 2038 outside the region. Due to how Magit visualizes the selection, it 2039 should be obvious that this difference exists. 2040 2041 Not every command acts on every valid selection. Some commands do 2042 not even consider the location of point, others may act on the section 2043 at point but not support acting on the selection, and even commands that 2044 do support the selection of course only do so if it selects things that 2045 they can act on. 2046 2047 This is the main reason why the selection must include the section at 2048 point. Even if a selection exists, the invoked command may disregard 2049 it, in which case it may act on the current section only. It is much 2050 safer to only act on the current section but not the other selected 2051 sections than it is to act on the current section *instead* of the 2052 selected sections. The latter would be much more surprising and if the 2053 current section always is part of the selection, then that cannot 2054 happen. 2055 2056 -- Variable: magit-keep-region-overlay 2057 This variable controls whether the region is visualized as usual 2058 even when a valid Magit selection or a hunk-internal region exists. 2059 See the doc-string for more information. 2060 2061 2062 File: magit.info, Node: The hunk-internal region, Next: Support for Completion Frameworks, Prev: The Selection, Up: Completion Confirmation and the Selection 2063 2064 4.5.4 The hunk-internal region 2065 ------------------------------ 2066 2067 Somewhat related to the Magit selection described in the previous 2068 section is the hunk-internal region. 2069 2070 Like the selection, the hunk-internal region is based on the Emacs 2071 region but causes that region to not be visualized as it would in other 2072 Emacs buffers, and includes the line on which the region ends even if it 2073 ends at the very beginning of that line. 2074 2075 Unlike the selection, which is based on a region that must begin in 2076 the heading of one section and ends in the section of a sibling section, 2077 the hunk-internal region must begin inside the *body* of a hunk section 2078 and end in the body of the *same* section. 2079 2080 The hunk-internal region is honored by "apply" commands, which can, 2081 among other targets, act on a hunk. If the hunk-internal region is 2082 active, then such commands act only on the marked part of the hunk 2083 instead of on the complete hunk. 2084 2085 2086 File: magit.info, Node: Support for Completion Frameworks, Next: Additional Completion Options, Prev: The hunk-internal region, Up: Completion Confirmation and the Selection 2087 2088 4.5.5 Support for Completion Frameworks 2089 --------------------------------------- 2090 2091 The built-in option ‘completing-read-function’ specifies the low-level 2092 function used by ‘completing-read’ to ask a user to select from a list 2093 of choices. Its default value is ‘completing-read-default’. 2094 Alternative completion frameworks typically activate themselves by 2095 substituting their own implementation. 2096 2097 Mostly for historic reasons Magit provides a similar option named 2098 ‘magit-completing-read-function’, which only controls the low-level 2099 function used by ‘magit-completing-read’. This option also makes it 2100 possible to use a different completing mechanism for Magit than for the 2101 rest of Emacs, but doing that is not recommend. 2102 2103 You most likely don’t have to customize the magit-specific option to 2104 use an alternative completion framework. For example, if you enable 2105 ‘ivy-mode’, then Magit will respect that, and if you enable ‘helm-mode’, 2106 then you are done too. 2107 2108 However if you want to use Ido, then ‘ido-mode’ won’t do the trick. 2109 You will also have to install the ‘ido-completing-read+’ package and use 2110 ‘magit-ido-completing-read’ as ‘magit-completing-read-function’. 2111 2112 -- User Option: magit-completing-read-function 2113 The value of this variable is the low-level function used to 2114 perform completion by code that uses ‘magit-completing-read’ (as 2115 opposed to the built-in ‘completing-read’). 2116 2117 The default value, ‘magit-builtin-completing-read’, is suitable for 2118 the standard completion mechanism, ‘ivy-mode’, and ‘helm-mode’ at 2119 least. 2120 2121 The built-in ‘completing-read’ and ‘completing-read-default’ are 2122 *not* suitable to be used here. ‘magit-builtin-completing-read’ 2123 performs some additional work, and any function used in its place 2124 has to do the same. 2125 2126 -- Function: magit-builtin-completing-read prompt choices &optional 2127 predicate require-match initial-input hist def 2128 This function performs completion using the built-in 2129 ‘completing-read’ and does some additional magit-specific work. 2130 2131 -- Function: magit-ido-completing-read prompt choices &optional 2132 predicate require-match initial-input hist def 2133 This function performs completion using ‘ido-completing-read+’ from 2134 the package by the same name (which you have to explicitly install) 2135 and does some additional magit-specific work. 2136 2137 We have to use ‘ido-completing-read+’ instead of the 2138 ‘ido-completing-read’ that comes with Ido itself, because the 2139 latter, while intended as a drop-in replacement, cannot serve that 2140 purpose because it violates too many of the implicit conventions. 2141 2142 -- Function: magit-completing-read prompt choices &optional predicate 2143 require-match initial-input hist def fallback 2144 This is the function that Magit commands use when they need the 2145 user to select a single thing to act on. The arguments have the 2146 same meaning as for ‘completing-read’, except for FALLBACK, which 2147 is unique to this function and is described below. 2148 2149 Instead of asking the user to choose from a list of possible 2150 candidates, this function may just return the default specified by 2151 DEF, with or without requiring user confirmation. Whether that is 2152 the case depends on PROMPT, ‘this-command’ and 2153 ‘magit-dwim-selection’. See the documentation of the latter for 2154 more information. 2155 2156 If it does read a value in the minibuffer, then this function acts 2157 similar to ‘completing-read’, except for the following: 2158 2159 • COLLECTION must be a list of choices. A function is not 2160 supported. 2161 2162 • If REQUIRE-MATCH is ‘nil’ and the user exits without a choice, 2163 then ‘nil’ is returned instead of an empty string. 2164 2165 • If REQUIRE-MATCH is non-nil and the users exits without a 2166 choice, an user-error is raised. 2167 2168 • FALLBACK specifies a secondary default that is only used if 2169 the primary default DEF is ‘nil’. The secondary default is 2170 not subject to ‘magit-dwim-selection’ — if DEF is ‘nil’ but 2171 FALLBACK is not, then this function always asks the user to 2172 choose a candidate, just as if both defaults were ‘nil’. 2173 2174 • ‘format-prompt’ is called on PROMPT and DEF (or FALLBACK if 2175 DEF is ‘nil’). This appends ": " to the prompt and may also 2176 add the default to the prompt, using the format specified by 2177 ‘minibuffer-default-prompt-format’ and depending on 2178 ‘magit-completing-read-default-prompt-predicate’. 2179 2180 2181 File: magit.info, Node: Additional Completion Options, Prev: Support for Completion Frameworks, Up: Completion Confirmation and the Selection 2182 2183 4.5.6 Additional Completion Options 2184 ----------------------------------- 2185 2186 -- User Option: magit-list-refs-sortby 2187 For many commands that read a ref or refs from the user, the value 2188 of this option can be used to control the order of the refs. Valid 2189 values include any key accepted by the ‘--sort’ flag of ‘git 2190 for-each-ref’. By default, refs are sorted alphabetically by their 2191 full name (e.g., "refs/heads/master"). 2192 2193 2194 File: magit.info, Node: Mouse Support, Next: Running Git, Prev: Completion Confirmation and the Selection, Up: Interface Concepts 2195 2196 4.6 Mouse Support 2197 ================= 2198 2199 Double clicking on a section heading toggles the visibility of its body, 2200 if any. Likewise clicking in the left fringe toggles the visibility of 2201 the appropriate section. 2202 2203 A context menu is provided but has to be enabled explicitly. In 2204 Emacs 28 and greater, enable the global mode ‘context-menu-mode’. If 2205 you use an older Emacs release, set 2206 ‘magit-section-show-context-menu-for-emacs<28’. 2207 2208 2209 File: magit.info, Node: Running Git, Prev: Mouse Support, Up: Interface Concepts 2210 2211 4.7 Running Git 2212 =============== 2213 2214 * Menu: 2215 2216 * Viewing Git Output:: 2217 * Git Process Status:: 2218 * Running Git Manually:: 2219 * Git Executable:: 2220 * Global Git Arguments:: 2221 2222 2223 File: magit.info, Node: Viewing Git Output, Next: Git Process Status, Up: Running Git 2224 2225 4.7.1 Viewing Git Output 2226 ------------------------ 2227 2228 Magit runs Git either for side-effects (e.g., when pushing) or to get 2229 some value (e.g., the name of the current branch). 2230 2231 When Git is run for side-effects, the process output is logged in a 2232 per-repository log buffer, which can be consulted using the 2233 ‘magit-process’ command when things don’t go as expected. 2234 2235 The output/errors for up to ‘magit-process-log-max’ Git commands are 2236 retained. 2237 2238 ‘$’ (‘magit-process’) 2239 This commands displays the process buffer for the current 2240 repository. 2241 2242 Inside that buffer, the usual key bindings for navigating and showing 2243 sections are available. There is one additional command. 2244 2245 ‘k’ (‘magit-process-kill’) 2246 This command kills the process represented by the section at point. 2247 2248 -- Variable: magit-git-debug 2249 This option controls whether additional reporting of git errors is 2250 enabled. 2251 2252 Magit basically calls git for one of these two reasons: for 2253 side-effects or to do something with its standard output. 2254 2255 When git is run for side-effects then its output, including error 2256 messages, go into the process buffer which is shown when using ‘$’. 2257 2258 When git’s output is consumed in some way, then it would be too 2259 expensive to also insert it into this buffer, but when this option 2260 is non-nil and git returns with a non-zero exit status, then at 2261 least its standard error is inserted into this buffer. 2262 2263 This is only intended for debugging purposes. Do not enable this 2264 permanently, that would negatively affect performance. 2265 2266 This is only intended for debugging purposes. Do not enable this 2267 permanently, that would negatively affect performance. Also note 2268 that just because git exits with a non-zero exit status and prints 2269 an error message that usually doesn’t mean that it is an error as 2270 far as Magit is concerned, which is another reason we usually hide 2271 these error messages. Whether some error message is relevant in 2272 the context of some unexpected behavior has to be judged on a case 2273 by case basis. 2274 2275 The command ‘magit-toggle-git-debug’ changes the value of this 2276 variable. 2277 2278 -- Variable: magit-process-extreme-logging 2279 This option controls whether ‘magit-process-file’ logs to the 2280 ‘*Messages*’ buffer. 2281 2282 Only intended for temporary use when you try to figure out how 2283 Magit uses Git behind the scene. Output that normally goes to the 2284 magit-process buffer continues to go there. Not all output goes to 2285 either of these two buffers. 2286 2287 2288 File: magit.info, Node: Git Process Status, Next: Running Git Manually, Prev: Viewing Git Output, Up: Running Git 2289 2290 4.7.2 Git Process Status 2291 ------------------------ 2292 2293 When a Git process is running for side-effects, Magit displays an 2294 indicator in the mode line, using the ‘magit-mode-line-process’ face. 2295 2296 If the Git process exits successfully, the process indicator is 2297 removed from the mode line immediately. 2298 2299 In the case of a Git error, the process indicator is not removed, but 2300 is instead highlighted with the ‘magit-mode-line-process-error’ face, 2301 and the error details from the process buffer are provided as a tooltip 2302 for mouse users. This error indicator persists in the mode line until 2303 the next magit buffer refresh. 2304 2305 If you do not wish process errors to be indicated in the mode line, 2306 customize the ‘magit-process-display-mode-line-error’ user option. 2307 2308 Process errors are additionally indicated at the top of the status 2309 buffer. 2310 2311 2312 File: magit.info, Node: Running Git Manually, Next: Git Executable, Prev: Git Process Status, Up: Running Git 2313 2314 4.7.3 Running Git Manually 2315 -------------------------- 2316 2317 While Magit provides many Emacs commands to interact with Git, it does 2318 not cover everything. In those cases your existing Git knowledge will 2319 come in handy. Magit provides some commands for running arbitrary Git 2320 commands by typing them into the minibuffer, instead of having to switch 2321 to a shell. 2322 2323 ‘!’ (‘magit-run’) 2324 This transient prefix command binds the following suffix commands 2325 and displays them in a temporary buffer until a suffix is invoked. 2326 2327 ‘! !’ (‘magit-git-command-topdir’) 2328 This command reads a command from the user and executes it in the 2329 top-level directory of the current working tree. 2330 2331 The string "git " is used as initial input when prompting the user 2332 for the command. It can be removed to run another command. 2333 2334 ‘:’ (‘magit-git-command’) 2335 ‘! p’ 2336 This command reads a command from the user and executes it in 2337 ‘default-directory’. With a prefix argument the command is 2338 executed in the top-level directory of the current working tree 2339 instead. 2340 2341 The string "git " is used as initial input when prompting the user 2342 for the command. It can be removed to run another command. 2343 2344 ‘! s’ (‘magit-shell-command-topdir’) 2345 This command reads a command from the user and executes it in the 2346 top-level directory of the current working tree. 2347 2348 ‘! S’ (‘magit-shell-command’) 2349 This command reads a command from the user and executes it in 2350 ‘default-directory’. With a prefix argument the command is 2351 executed in the top-level directory of the current working tree 2352 instead. 2353 2354 -- User Option: magit-shell-command-verbose-prompt 2355 Whether the prompt, used by the above commands when reading a shell 2356 command, shows the directory in which it will be run. 2357 2358 These suffix commands start external gui tools. 2359 2360 ‘! k’ (‘magit-run-gitk’) 2361 This command runs ‘gitk’ in the current repository. 2362 2363 ‘! a’ (‘magit-run-gitk-all’) 2364 This command runs ‘gitk --all’ in the current repository. 2365 2366 ‘! b’ (‘magit-run-gitk-branches’) 2367 This command runs ‘gitk --branches’ in the current repository. 2368 2369 ‘! g’ (‘magit-run-git-gui’) 2370 This command runs ‘git gui’ in the current repository. 2371 2372 ‘! m’ (‘magit-git-mergetool’) 2373 This command runs ‘git mergetool --gui’ in the current repository. 2374 2375 With a prefix argument this acts as a transient prefix command, 2376 allowing the user to select the mergetool and change some settings. 2377 2378 2379 File: magit.info, Node: Git Executable, Next: Global Git Arguments, Prev: Running Git Manually, Up: Running Git 2380 2381 4.7.4 Git Executable 2382 -------------------- 2383 2384 When Magit calls Git, then it may do so using the absolute path to the 2385 ‘git’ executable, or using just its name. 2386 2387 When running ‘git’ locally and the ‘system-type’ is ‘windows-nt’ (any 2388 Windows version) or ‘darwin’ (macOS) then ‘magit-git-executable’ is set 2389 to an absolute path when Magit is loaded. 2390 2391 On Windows it is necessary to use an absolute path because Git comes 2392 with several wrapper scripts for the actual ‘git’ binary, which are also 2393 placed on ‘$PATH’, and using one of these wrappers instead of the binary 2394 would degrade performance horribly. For some macOS users using just the 2395 name of the executable also performs horribly, so we avoid doing that on 2396 that platform as well. On other platforms, using just the name seems to 2397 work just fine. 2398 2399 Using an absolute path when running ‘git’ on a remote machine over 2400 Tramp, would be problematic to use an absolute path that is suitable on 2401 the local machine, so a separate option is used to control the name or 2402 path that is used on remote machines. 2403 2404 -- User Option: magit-git-executable 2405 The ‘git’ executable used by Magit on the local host. This should 2406 be either the absolute path to the executable, or the string "git" 2407 to let Emacs find the executable itself, using the standard 2408 mechanism for doing such things. 2409 2410 -- User Option: magit-remote-git-executable 2411 The ‘git’ executable used by Magit on remote machines over Tramp. 2412 Normally this should be just the string "git". Consider 2413 customizing ‘tramp-remote-path’ instead of this option. 2414 2415 If Emacs is unable to find the correct executable, then you can work 2416 around that by explicitly setting the value of one of these two options. 2417 Doing that should be considered a kludge; it is better to make sure that 2418 the order in ‘exec-path’ or ‘tramp-remote-path’ is correct. 2419 2420 Note that ‘exec-path’ is set based on the value of the ‘PATH’ 2421 environment variable that is in effect when Emacs is started. If you 2422 set ‘PATH’ in your shell’s init files, then that only has an effect on 2423 Emacs if you start it from that shell (because the environment of a 2424 process is only passed to its child processes, not to arbitrary other 2425 processes). If that is not how you start Emacs, then the 2426 ‘exec-path-from-shell’ package can help; though honestly I consider that 2427 a kludge too. 2428 2429 The command ‘magit-debug-git-executable’ can be useful to find out 2430 where Emacs is searching for ‘git’. 2431 2432 ‘M-x magit-debug-git-executable’ 2433 This command displays a buffer with information about 2434 ‘magit-git-executable’ and ‘magit-remote-git-executable’. 2435 2436 ‘M-x magit-version’ 2437 This command shows the currently used versions of Magit, Git, and 2438 Emacs in the echo area. Non-interactively this just returns the 2439 Magit version. 2440 2441 2442 File: magit.info, Node: Global Git Arguments, Prev: Git Executable, Up: Running Git 2443 2444 4.7.5 Global Git Arguments 2445 -------------------------- 2446 2447 -- User Option: magit-git-global-arguments 2448 The arguments set here are used every time the git executable is 2449 run as a subprocess. They are placed right after the executable 2450 itself and before the git command - as in ‘git HERE... COMMAND 2451 REST’. For valid arguments see *note (gitman)git::. 2452 2453 Be careful what you add here, especially if you are using Tramp to 2454 connect to servers with ancient Git versions. Never remove 2455 anything that is part of the default value, unless you really know 2456 what you are doing. And think very hard before adding something; 2457 it will be used every time Magit runs Git for any purpose. 2458 2459 2460 File: magit.info, Node: Inspecting, Next: Manipulating, Prev: Interface Concepts, Up: Top 2461 2462 5 Inspecting 2463 ************ 2464 2465 The functionality provided by Magit can be roughly divided into three 2466 groups: inspecting existing data, manipulating existing data or adding 2467 new data, and transferring data. Of course that is a rather crude 2468 distinction that often falls short, but it’s more useful than no 2469 distinction at all. This section is concerned with inspecting data, the 2470 next two with manipulating and transferring it. Then follows a section 2471 about miscellaneous functionality, which cannot easily be fit into this 2472 distinction. 2473 2474 Of course other distinctions make sense too, e.g., Git’s distinction 2475 between porcelain and plumbing commands, which for the most part is 2476 equivalent to Emacs’ distinction between interactive commands and 2477 non-interactive functions. All of the sections mentioned before are 2478 mainly concerned with the porcelain – Magit’s plumbing layer is 2479 described later. 2480 2481 * Menu: 2482 2483 * Status Buffer:: 2484 * Repository List:: 2485 * Logging:: 2486 * Diffing:: 2487 * Ediffing:: 2488 * References Buffer:: 2489 * Bisecting:: 2490 * Visiting Files and Blobs:: 2491 * Blaming:: 2492 2493 2494 File: magit.info, Node: Status Buffer, Next: Repository List, Up: Inspecting 2495 2496 5.1 Status Buffer 2497 ================= 2498 2499 While other Magit buffers contain, e.g., one particular diff or one 2500 particular log, the status buffer contains the diffs for staged and 2501 unstaged changes, logs for unpushed and unpulled commits, lists of 2502 stashes and untracked files, and information related to the current 2503 branch. 2504 2505 During certain incomplete operations – for example when a merge 2506 resulted in a conflict – additional information is displayed that helps 2507 proceeding with or aborting the operation. 2508 2509 The command ‘magit-status’ displays the status buffer belonging to 2510 the current repository in another window. This command is used so often 2511 that it should be bound globally. We recommend using ‘C-x g’: 2512 2513 (global-set-key (kbd "C-x g") 'magit-status) 2514 2515 ‘C-x g’ (‘magit-status’) 2516 When invoked from within an existing Git repository, then this 2517 command shows the status of that repository in a buffer. 2518 2519 If the current directory isn’t located within a Git repository, 2520 then this command prompts for an existing repository or an 2521 arbitrary directory, depending on the option 2522 ‘magit-repository-directories’, and the status for the selected 2523 repository is shown instead. 2524 2525 • If that option specifies any existing repositories, then the 2526 user is asked to select one of them. 2527 2528 • Otherwise the user is asked to select an arbitrary directory 2529 using regular file-name completion. If the selected directory 2530 is the top-level directory of an existing working tree, then 2531 the status buffer for that is shown. 2532 2533 • Otherwise the user is offered to initialize the selected 2534 directory as a new repository. After creating the repository 2535 its status buffer is shown. 2536 2537 These fallback behaviors can also be forced using one or more 2538 prefix arguments: 2539 2540 • With two prefix arguments (or more precisely a numeric prefix 2541 value of 16 or greater) an arbitrary directory is read, which 2542 is then acted on as described above. The same could be 2543 accomplished using the command ‘magit-init’. 2544 2545 • With a single prefix argument an existing repository is read 2546 from the user, or if no repository can be found based on the 2547 value of ‘magit-repository-directories’, then the behavior is 2548 the same as with two prefix arguments. 2549 2550 -- User Option: magit-repository-directories 2551 List of directories that are Git repositories or contain Git 2552 repositories. 2553 2554 Each element has the form ‘(DIRECTORY . DEPTH)’. DIRECTORY has to 2555 be a directory or a directory file-name, a string. DEPTH, an 2556 integer, specifies the maximum depth to look for Git repositories. 2557 If it is 0, then only add DIRECTORY itself. 2558 2559 This option controls which repositories are being listed by 2560 ‘magit-list-repositories’. It also affects ‘magit-status’ (which 2561 see) in potentially surprising ways (see above). 2562 2563 -- Command: magit-status-quick 2564 This command is an alternative to ‘magit-status’ that usually 2565 avoids refreshing the status buffer. 2566 2567 If the status buffer of the current Git repository exists but isn’t 2568 being displayed in the selected frame, then it is displayed without 2569 being refreshed. 2570 2571 If the status buffer is being displayed in the selected frame, then 2572 this command refreshes it. 2573 2574 Prefix arguments have the same meaning as for ‘magit-status’, and 2575 additionally cause the buffer to be refresh. 2576 2577 To use this command add this to your init file: 2578 2579 (global-set-key (kbd "C-x g") 'magit-status-quick). 2580 2581 If you do that and then for once want to redisplay the buffer and 2582 also immediately refresh it, then type ‘C-x g’ followed by ‘g’. 2583 2584 A possible alternative command is 2585 ‘magit-display-repository-buffer’. It supports displaying any 2586 existing Magit buffer that belongs to the current repository; not 2587 just the status buffer. 2588 2589 -- Command: ido-enter-magit-status 2590 From an Ido prompt used to open a file, instead drop into 2591 ‘magit-status’. This is similar to ‘ido-magic-delete-char’, which, 2592 despite its name, usually causes a Dired buffer to be created. 2593 2594 To make this command available, use something like: 2595 2596 (add-hook 'ido-setup-hook 2597 (lambda () 2598 (define-key ido-completion-map 2599 (kbd \"C-x g\") 'ido-enter-magit-status))) 2600 2601 Starting with Emacs 25.1 the Ido keymaps are defined just once 2602 instead of every time Ido is invoked, so now you can modify it like 2603 pretty much every other keymap: 2604 2605 (define-key ido-common-completion-map 2606 (kbd \"C-x g\") 'ido-enter-magit-status) 2607 2608 * Menu: 2609 2610 * Status Sections:: 2611 * Status Header Sections:: 2612 * Status Module Sections:: 2613 * Status Options:: 2614 2615 2616 File: magit.info, Node: Status Sections, Next: Status Header Sections, Up: Status Buffer 2617 2618 5.1.1 Status Sections 2619 --------------------- 2620 2621 The contents of status buffers is controlled using the hook 2622 ‘magit-status-sections-hook’. See *note Section Hooks:: to learn about 2623 such hooks and how to customize them. 2624 2625 -- User Option: magit-status-sections-hook 2626 Hook run to insert sections into a status buffer. 2627 2628 The first function on that hook by default is 2629 ‘magit-insert-status-headers’; it is described in the next section. By 2630 default the following functions are also members of that hook: 2631 2632 -- Function: magit-insert-merge-log 2633 Insert section for the on-going merge. Display the heads that are 2634 being merged. If no merge is in progress, do nothing. 2635 2636 -- Function: magit-insert-rebase-sequence 2637 Insert section for the on-going rebase sequence. If no such 2638 sequence is in progress, do nothing. 2639 2640 -- Function: magit-insert-am-sequence 2641 Insert section for the on-going patch applying sequence. If no 2642 such sequence is in progress, do nothing. 2643 2644 -- Function: magit-insert-sequencer-sequence 2645 Insert section for the on-going cherry-pick or revert sequence. If 2646 no such sequence is in progress, do nothing. 2647 2648 -- Function: magit-insert-bisect-output 2649 While bisecting, insert section with output from ‘git bisect’. 2650 2651 -- Function: magit-insert-bisect-rest 2652 While bisecting, insert section visualizing the bisect state. 2653 2654 -- Function: magit-insert-bisect-log 2655 While bisecting, insert section logging bisect progress. 2656 2657 -- Function: magit-insert-untracked-files 2658 Maybe insert a list or tree of untracked files. 2659 2660 Do so depending on the value of ‘status.showUntrackedFiles’. Note 2661 that even if the value is ‘all’, Magit still initially only shows 2662 directories. But the directory sections can then be expanded using 2663 ‘TAB’. 2664 2665 If the first element of ‘magit-buffer-diff-files’ is a directory, 2666 then limit the list to files below that. The value of that 2667 variable can be set using ‘D -- DIRECTORY RET g’. 2668 2669 -- Function: magit-insert-unstaged-changes 2670 Insert section showing unstaged changes. 2671 2672 -- Function: magit-insert-staged-changes 2673 Insert section showing staged changes. 2674 2675 -- Function: magit-insert-stashes &optional ref heading 2676 Insert the ‘stashes’ section showing reflog for "refs/stash". If 2677 optional REF is non-nil show reflog for that instead. If optional 2678 HEADING is non-nil use that as section heading instead of 2679 "Stashes:". 2680 2681 -- Function: magit-insert-unpulled-from-upstream 2682 Insert section showing commits that haven’t been pulled from the 2683 upstream branch yet. 2684 2685 -- Function: magit-insert-unpulled-from-pushremote 2686 Insert section showing commits that haven’t been pulled from the 2687 push-remote branch yet. 2688 2689 -- Function: magit-insert-unpushed-to-upstream 2690 Insert section showing commits that haven’t been pushed to the 2691 upstream yet. 2692 2693 -- Function: magit-insert-unpushed-to-pushremote 2694 Insert section showing commits that haven’t been pushed to the 2695 push-remote yet. 2696 2697 The following functions can also be added to the above hook: 2698 2699 -- Function: magit-insert-tracked-files 2700 Insert a tree of tracked files. 2701 2702 -- Function: magit-insert-ignored-files 2703 Insert a tree of ignored files. Its possible to limit the logs in 2704 the current buffer to a certain directory using ‘D = f <DIRECTORY> 2705 RET g’. If you do that, then that that also affects this command. 2706 2707 The log filter can be used to limit to multiple files. In that 2708 case this function only respects the first of the files and only if 2709 it is a directory. 2710 2711 -- Function: magit-insert-skip-worktree-files 2712 Insert a tree of skip-worktree files. If the first element of 2713 ‘magit-buffer-diff-files’ is a directory, then limit the list to 2714 files below that. The value of that variable can be set using ‘D 2715 -- DIRECTORY RET g’. 2716 2717 -- Function: magit-insert-assumed-unchanged-files 2718 Insert a tree of files that are assumed to be unchanged. If the 2719 first element of ‘magit-buffer-diff-files’ is a directory, then 2720 limit the list to files below that. The value of that variable can 2721 be set using ‘D -- DIRECTORY RET g’. 2722 2723 -- Function: magit-insert-unpulled-or-recent-commits 2724 Insert section showing unpulled or recent commits. If an upstream 2725 is configured for the current branch and it is ahead of the current 2726 branch, then show the missing commits. Otherwise, show the last 2727 ‘magit-log-section-commit-count’ commits. 2728 2729 -- Function: magit-insert-recent-commits 2730 Insert section showing the last ‘magit-log-section-commit-count’ 2731 commits. 2732 2733 -- User Option: magit-log-section-commit-count 2734 How many recent commits ‘magit-insert-recent-commits’ and 2735 ‘magit-insert-unpulled-or-recent-commits’ (provided there are no 2736 unpulled commits) show. 2737 2738 -- Function: magit-insert-unpulled-cherries 2739 Insert section showing unpulled commits. Like 2740 ‘magit-insert-unpulled-commits’ but prefix each commit that has not 2741 been applied yet (i.e., a commit with a patch-id not shared with 2742 any local commit) with "+", and all others with "-". 2743 2744 -- Function: magit-insert-unpushed-cherries 2745 Insert section showing unpushed commits. Like 2746 ‘magit-insert-unpushed-commits’ but prefix each commit which has 2747 not been applied to upstream yet (i.e., a commit with a patch-id 2748 not shared with any upstream commit) with "+" and all others with 2749 "-". 2750 2751 See *note References Buffer:: for some more section inserters, which 2752 could be used here. 2753 2754 2755 File: magit.info, Node: Status Header Sections, Next: Status Module Sections, Prev: Status Sections, Up: Status Buffer 2756 2757 5.1.2 Status Header Sections 2758 ---------------------------- 2759 2760 The contents of status buffers is controlled using the hook 2761 ‘magit-status-sections-hook’ (see *note Status Sections::). 2762 2763 By default ‘magit-insert-status-headers’ is the first member of that 2764 hook variable. 2765 2766 -- Function: magit-insert-status-headers 2767 Insert headers sections appropriate for ‘magit-status-mode’ 2768 buffers. The sections are inserted by running the functions on the 2769 hook ‘magit-status-headers-hook’. 2770 2771 -- User Option: magit-status-headers-hook 2772 Hook run to insert headers sections into the status buffer. 2773 2774 This hook is run by ‘magit-insert-status-headers’, which in turn 2775 has to be a member of ‘magit-status-sections-hook’ to be used at 2776 all. 2777 2778 By default the following functions are members of the above hook: 2779 2780 -- Function: magit-insert-error-header 2781 Insert a header line showing the message about the Git error that 2782 just occurred. 2783 2784 This function is only aware of the last error that occur when Git 2785 was run for side-effects. If, for example, an error occurs while 2786 generating a diff, then that error won’t be inserted. Refreshing 2787 the status buffer causes this section to disappear again. 2788 2789 -- Function: magit-insert-diff-filter-header 2790 Insert a header line showing the effective diff filters. 2791 2792 -- Function: magit-insert-head-branch-header 2793 Insert a header line about the current branch or detached ‘HEAD’. 2794 2795 -- Function: magit-insert-upstream-branch-header 2796 Insert a header line about the branch that is usually pulled into 2797 the current branch. 2798 2799 -- Function: magit-insert-push-branch-header 2800 Insert a header line about the branch that the current branch is 2801 usually pushed to. 2802 2803 -- Function: magit-insert-tags-header 2804 Insert a header line about the current and/or next tag, along with 2805 the number of commits between the tag and ‘HEAD’. 2806 2807 The following functions can also be added to the above hook: 2808 2809 -- Function: magit-insert-repo-header 2810 Insert a header line showing the path to the repository top-level. 2811 2812 -- Function: magit-insert-remote-header 2813 Insert a header line about the remote of the current branch. 2814 2815 If no remote is configured for the current branch, then fall back 2816 showing the "origin" remote, or if that does not exist the first 2817 remote in alphabetic order. 2818 2819 -- Function: magit-insert-user-header 2820 Insert a header line about the current user. 2821 2822 2823 File: magit.info, Node: Status Module Sections, Next: Status Options, Prev: Status Header Sections, Up: Status Buffer 2824 2825 5.1.3 Status Module Sections 2826 ---------------------------- 2827 2828 The contents of status buffers is controlled using the hook 2829 ‘magit-status-sections-hook’ (see *note Status Sections::). 2830 2831 By default ‘magit-insert-modules’ is _not_ a member of that hook 2832 variable. 2833 2834 -- Function: magit-insert-modules 2835 Insert submodule sections. 2836 2837 Hook ‘magit-module-sections-hook’ controls which module sections 2838 are inserted, and option ‘magit-module-sections-nested’ controls 2839 whether they are wrapped in an additional section. 2840 2841 -- User Option: magit-module-sections-hook 2842 Hook run by ‘magit-insert-modules’. 2843 2844 -- User Option: magit-module-sections-nested 2845 This option controls whether ‘magit-insert-modules’ wraps inserted 2846 sections in an additional section. 2847 2848 If this is non-nil, then only a single top-level section is 2849 inserted. If it is nil, then all sections listed in 2850 ‘magit-module-sections-hook’ become top-level sections. 2851 2852 -- Function: magit-insert-modules-overview 2853 Insert sections for all submodules. For each section insert the 2854 path, the branch, and the output of ‘git describe --tags’, or, 2855 failing that, the abbreviated HEAD commit hash. 2856 2857 Press ‘RET’ on such a submodule section to show its own status 2858 buffer. Press ‘RET’ on the "Modules" section to display a list of 2859 submodules in a separate buffer. This shows additional information 2860 not displayed in the super-repository’s status buffer. 2861 2862 -- Function: magit-insert-modules-unpulled-from-upstream 2863 Insert sections for modules that haven’t been pulled from the 2864 upstream yet. These sections can be expanded to show the 2865 respective commits. 2866 2867 -- Function: magit-insert-modules-unpulled-from-pushremote 2868 Insert sections for modules that haven’t been pulled from the 2869 push-remote yet. These sections can be expanded to show the 2870 respective commits. 2871 2872 -- Function: magit-insert-modules-unpushed-to-upstream 2873 Insert sections for modules that haven’t been pushed to the 2874 upstream yet. These sections can be expanded to show the 2875 respective commits. 2876 2877 -- Function: magit-insert-modules-unpushed-to-pushremote 2878 Insert sections for modules that haven’t been pushed to the 2879 push-remote yet. These sections can be expanded to show the 2880 respective commits. 2881 2882 2883 File: magit.info, Node: Status Options, Prev: Status Module Sections, Up: Status Buffer 2884 2885 5.1.4 Status Options 2886 -------------------- 2887 2888 -- User Option: magit-status-margin 2889 This option specifies whether the margin is initially shown in 2890 Magit-Status mode buffers and how it is formatted. 2891 2892 The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’. 2893 2894 • If INIT is non-nil, then the margin is shown initially. 2895 • STYLE controls how to format the author or committer date. It 2896 can be one of ‘age’ (to show the age of the commit), 2897 ‘age-abbreviated’ (to abbreviate the time unit to a 2898 character), or a string (suitable for ‘format-time-string’) to 2899 show the actual date. Option 2900 ‘magit-log-margin-show-committer-date’ controls which date is 2901 being displayed. 2902 • WIDTH controls the width of the margin. This exists for 2903 forward compatibility and currently the value should not be 2904 changed. 2905 • AUTHOR controls whether the name of the author is also shown 2906 by default. 2907 • AUTHOR-WIDTH has to be an integer. When the name of the 2908 author is shown, then this specifies how much space is used to 2909 do so. 2910 2911 Also see the proceeding section for more options concerning status 2912 buffers. 2913 2914 2915 File: magit.info, Node: Repository List, Next: Logging, Prev: Status Buffer, Up: Inspecting 2916 2917 5.2 Repository List 2918 =================== 2919 2920 -- Command: magit-list-repositories 2921 This command displays a list of repositories in a separate buffer. 2922 2923 The option ‘magit-repository-directories’ controls which 2924 repositories are displayed. 2925 2926 -- User Option: magit-repolist-columns 2927 This option controls what columns are displayed by the command 2928 ‘magit-list-repositories’ and how they are displayed. 2929 2930 Each element has the form ‘(HEADER WIDTH FORMAT PROPS)’. 2931 2932 HEADER is the string displayed in the header. WIDTH is the width 2933 of the column. FORMAT is a function that is called with one 2934 argument, the repository identification (usually its basename), and 2935 with ‘default-directory’ bound to the toplevel of its working tree. 2936 It has to return a string to be inserted or nil. PROPS is an alist 2937 that supports the keys ‘:right-align’, ‘:pad-right’ and ‘:sort’. 2938 2939 The ‘:sort’ function has a weird interface described in the 2940 docstring of ‘tabulated-list--get-sort’. Alternatively ‘<’ and 2941 ‘magit-repolist-version<’ can be used as those functions are 2942 automatically replaced with functions that satisfy the interface. 2943 Set ‘:sort’ to ‘nil’ to inhibit sorting; if unspecified, then the 2944 column is sortable using the default sorter. 2945 2946 You may wish to display a range of numeric columns using just one 2947 character per column and without any padding between columns, in 2948 which case you should use an appropriate HEADER, set WIDTH to 1, 2949 and set ‘:pad-right’ to 9. ‘+’ is substituted for numbers higher 2950 than 9. 2951 2952 The following functions can be added to the above option: 2953 2954 -- Function: magit-repolist-column-ident 2955 This function inserts the identification of the repository. 2956 Usually this is just its basename. 2957 2958 -- Function: magit-repolist-column-path 2959 This function inserts the absolute path of the repository. 2960 2961 -- Function: magit-repolist-column-version 2962 This function inserts a description of the repository’s ‘HEAD’ 2963 revision. 2964 2965 -- Function: magit-repolist-column-branch 2966 This function inserts the name of the current branch. 2967 2968 -- Function: magit-repolist-column-upstream 2969 This function inserts the name of the upstream branch of the 2970 current branch. 2971 2972 -- Function: magit-repolist-column-branches 2973 This function inserts the number of branches. 2974 2975 -- Function: magit-repolist-column-stashes 2976 This function inserts the number of stashes. 2977 2978 -- Function: magit-repolist-column-flag 2979 This function inserts a flag as specified by 2980 ‘magit-repolist-column-flag-alist’. 2981 2982 By default this indicates whether there are uncommitted changes. 2983 2984 • ‘N’ if there is at least one untracked file. 2985 • ‘U’ if there is at least one unstaged file. 2986 • ‘S’ if there is at least one staged file. 2987 2988 Only the first one of these that applies is shown. 2989 2990 -- Function: magit-repolist-column-flags 2991 This functions insert all flags as specified by 2992 ‘magit-repolist-column-flag-alist’. 2993 2994 This is an alternative to function ‘magit-repolist-column-flag’, 2995 which only lists the first one found. 2996 2997 -- Function: magit-repolist-column-unpulled-from-upstream 2998 This function inserts the number of upstream commits not in the 2999 current branch. 3000 3001 -- Function: magit-repolist-column-unpulled-from-pushremote 3002 This function inserts the number of commits in the push branch but 3003 not the current branch. 3004 3005 -- Function: magit-repolist-column-unpushed-to-upstream 3006 This function inserts the number of commits in the current branch 3007 but not its upstream. 3008 3009 -- Function: magit-repolist-column-unpushed-to-pushremote 3010 This function inserts the number of commits in the current branch 3011 but not its push branch. 3012 3013 The following commands are available in repolist buffers: 3014 3015 ‘<RET>’ (‘magit-repolist-status’) 3016 This command shows the status for the repository at point. 3017 3018 ‘m’ (‘magit-repolist-mark’) 3019 This command marks the repository at point. 3020 3021 ‘u’ (‘magit-repolist-unmark’) 3022 This command unmarks the repository at point. 3023 3024 ‘f’ (‘magit-repolist-fetch’) 3025 This command fetches all marked repositories. If no repositories 3026 are marked, then it offers to fetch all displayed repositories. 3027 3028 ‘5’ (‘magit-repolist-find-file-other-frame’) 3029 This command reads a relative file-name (without completion) and 3030 opens the respective file in each marked repository in a new frame. 3031 If no repositories are marked, then it offers to do this for all 3032 displayed repositories. 3033 3034 3035 File: magit.info, Node: Logging, Next: Diffing, Prev: Repository List, Up: Inspecting 3036 3037 5.3 Logging 3038 =========== 3039 3040 The status buffer contains logs for the unpushed and unpulled commits, 3041 but that obviously isn’t enough. The transient prefix command 3042 ‘magit-log’, on ‘l’, features several suffix commands, which show a 3043 specific log in a separate log buffer. 3044 3045 Like other transient prefix commands, ‘magit-log’ also features 3046 several infix arguments that can be changed before invoking one of the 3047 suffix commands. However, in the case of the log transient, these 3048 arguments may be taken from those currently in use in the current 3049 repository’s log buffer, depending on the value of 3050 ‘magit-prefix-use-buffer-arguments’ (see *note Transient Arguments and 3051 Buffer Variables::). 3052 3053 For information about the various arguments, see *note 3054 (gitman)git-log::. The switch ‘++order=VALUE’ is converted to one of 3055 ‘--author-date-order’, ‘--date-order’, or ‘--topo-order’ before being 3056 passed to ‘git log’. 3057 3058 The log transient also features several reflog commands. See *note 3059 Reflog::. 3060 3061 ‘l’ (‘magit-log’) 3062 This transient prefix command binds the following suffix commands 3063 along with the appropriate infix arguments and displays them in a 3064 temporary buffer until a suffix is invoked. 3065 3066 ‘l l’ (‘magit-log-current’) 3067 Show log for the current branch. When ‘HEAD’ is detached or with a 3068 prefix argument, show log for one or more revs read from the 3069 minibuffer. 3070 3071 ‘l h’ (‘magit-log-head’) 3072 Show log for ‘HEAD’. 3073 3074 ‘l u’ (‘magit-log-related’) 3075 Show log for the current branch, its upstream and its push target. 3076 When the upstream is a local branch, then also show its own 3077 upstream. When ‘HEAD’ is detached, then show log for that, the 3078 previously checked out branch and its upstream and push-target. 3079 3080 ‘l o’ (‘magit-log-other’) 3081 Show log for one or more revs read from the minibuffer. The user 3082 can input any revision or revisions separated by a space, or even 3083 ranges, but only branches, tags, and a representation of the commit 3084 at point are available as completion candidates. 3085 3086 ‘l L’ (‘magit-log-branches’) 3087 Show log for all local branches and ‘HEAD’. 3088 3089 ‘l b’ (‘magit-log-all-branches’) 3090 Show log for all local and remote branches and ‘HEAD’. 3091 3092 ‘l a’ (‘magit-log-all’) 3093 Show log for all references and ‘HEAD’. 3094 3095 Two additional commands that show the log for the file or blob that 3096 is being visited in the current buffer exists, see *note Commands for 3097 Buffers Visiting Files::. The command ‘magit-cherry’ also shows a log, 3098 see *note Cherries::. 3099 3100 * Menu: 3101 3102 * Refreshing Logs:: 3103 * Log Buffer:: 3104 * Log Margin:: 3105 * Select from Log:: 3106 * Reflog:: 3107 * Cherries:: 3108 3109 3110 File: magit.info, Node: Refreshing Logs, Next: Log Buffer, Up: Logging 3111 3112 5.3.1 Refreshing Logs 3113 --------------------- 3114 3115 The transient prefix command ‘magit-log-refresh’, on ‘L’, can be used to 3116 change the log arguments used in the current buffer, without changing 3117 which log is shown. This works in dedicated log buffers, but also in 3118 the status buffer. 3119 3120 ‘L’ (‘magit-log-refresh’) 3121 This transient prefix command binds the following suffix commands 3122 along with the appropriate infix arguments and displays them in a 3123 temporary buffer until a suffix is invoked. 3124 3125 ‘L g’ (‘magit-log-refresh’) 3126 This suffix command sets the local log arguments for the current 3127 buffer. 3128 3129 ‘L s’ (‘magit-log-set-default-arguments’) 3130 This suffix command sets the default log arguments for buffers of 3131 the same type as that of the current buffer. Other existing 3132 buffers of the same type are not affected because their local 3133 values have already been initialized. 3134 3135 ‘L w’ (‘magit-log-save-default-arguments’) 3136 This suffix command sets the default log arguments for buffers of 3137 the same type as that of the current buffer, and saves the value 3138 for future sessions. Other existing buffers of the same type are 3139 not affected because their local values have already been 3140 initialized. 3141 3142 ‘L L’ (‘magit-toggle-margin’) 3143 Show or hide the margin. 3144 3145 3146 File: magit.info, Node: Log Buffer, Next: Log Margin, Prev: Refreshing Logs, Up: Logging 3147 3148 5.3.2 Log Buffer 3149 ---------------- 3150 3151 ‘L’ (‘magit-log-refresh’) 3152 This transient prefix command binds the following suffix commands 3153 along with the appropriate infix arguments and displays them in a 3154 temporary buffer until a suffix is invoked. 3155 3156 See *note Refreshing Logs::. 3157 3158 ‘q’ (‘magit-log-bury-buffer’) 3159 Bury the current buffer or the revision buffer in the same frame. 3160 Like ‘magit-mode-bury-buffer’ (which see) but with a negative 3161 prefix argument instead bury the revision buffer, provided it is 3162 displayed in the current frame. 3163 3164 ‘C-c C-b’ (‘magit-go-backward’) 3165 Move backward in current buffer’s history. 3166 3167 ‘C-c C-f’ (‘magit-go-forward’) 3168 Move forward in current buffer’s history. 3169 3170 ‘C-c C-n’ (‘magit-log-move-to-parent’) 3171 Move to a parent of the current commit. By default, this is the 3172 first parent, but a numeric prefix can be used to specify another 3173 parent. 3174 3175 ‘j’ (‘magit-log-move-to-revision’) 3176 Read a revision and move to it in current log buffer. 3177 3178 If the chosen reference or revision isn’t being displayed in the 3179 current log buffer, then inform the user about that and do nothing 3180 else. 3181 3182 If invoked outside any log buffer, then display the log buffer of 3183 the current repository first; creating it if necessary. 3184 3185 ‘<SPC>’ (‘magit-diff-show-or-scroll-up’) 3186 Update the commit or diff buffer for the thing at point. 3187 3188 Either show the commit or stash at point in the appropriate buffer, 3189 or if that buffer is already being displayed in the current frame 3190 and contains information about that commit or stash, then instead 3191 scroll the buffer up. If there is no commit or stash at point, 3192 then prompt for a commit. 3193 3194 ‘<DEL>’ (‘magit-diff-show-or-scroll-down’) 3195 Update the commit or diff buffer for the thing at point. 3196 3197 Either show the commit or stash at point in the appropriate buffer, 3198 or if that buffer is already being displayed in the current frame 3199 and contains information about that commit or stash, then instead 3200 scroll the buffer down. If there is no commit or stash at point, 3201 then prompt for a commit. 3202 3203 ‘=’ (‘magit-log-toggle-commit-limit’) 3204 Toggle the number of commits the current log buffer is limited to. 3205 If the number of commits is currently limited, then remove that 3206 limit. Otherwise set it to 256. 3207 3208 ‘+’ (‘magit-log-double-commit-limit’) 3209 Double the number of commits the current log buffer is limited to. 3210 3211 ‘-’ (‘magit-log-half-commit-limit’) 3212 Half the number of commits the current log buffer is limited to. 3213 3214 -- User Option: magit-log-auto-more 3215 Insert more log entries automatically when moving past the last 3216 entry. Only considered when moving past the last entry with 3217 ‘magit-goto-*-section’ commands. 3218 3219 -- User Option: magit-log-show-refname-after-summary 3220 Whether to show the refnames after the commit summaries. This is 3221 useful if you use really long branch names. 3222 3223 -- User Option: magit-log-show-color-graph-limit 3224 When showing more commits than specified by this option, then the 3225 ‘--color’ argument, if specified, is silently dropped. This is 3226 necessary because the ‘ansi-color’ library, which is used to turn 3227 control sequences into faces, is just too slow. 3228 3229 -- User Option: magit-log-show-signatures-limit 3230 When showing more commits than specified by this option, then the 3231 ‘--show-signature’ argument, if specified, is silently dropped. 3232 This is necessary because checking the signature of a large number 3233 of commits is just too slow. 3234 3235 Magit displays references in logs a bit differently from how Git does 3236 it. 3237 3238 Local branches are blue and remote branches are green. Of course 3239 that depends on the used theme, as do the colors used for other types of 3240 references. The current branch has a box around it, as do remote 3241 branches that are their respective remote’s ‘HEAD’ branch. 3242 3243 If a local branch and its push-target point at the same commit, then 3244 their names are combined to preserve space and to make that relationship 3245 visible. For example: 3246 3247 origin/feature 3248 [green][blue-] 3249 3250 instead of 3251 3252 feature origin/feature 3253 [blue-] [green-------] 3254 3255 Also note that while the transient features the ‘--show-signature’ 3256 argument, that won’t actually be used when enabled, because Magit 3257 defaults to use just one line per commit. Instead the commit colorized 3258 to indicate the validity of the signed commit object, using the faces 3259 named ‘magit-signature-*’ (which see). 3260 3261 For a description of ‘magit-log-margin’ see *note Log Margin::. 3262 3263 3264 File: magit.info, Node: Log Margin, Next: Select from Log, Prev: Log Buffer, Up: Logging 3265 3266 5.3.3 Log Margin 3267 ---------------- 3268 3269 In buffers which show one or more logs, it is possible to show 3270 additional information about each commit in the margin. The options 3271 used to configure the margin are named ‘magit-INFIX-margin’, where INFIX 3272 is the same as in the respective major-mode ‘magit-INFIX-mode’. In 3273 regular log buffers that would be ‘magit-log-margin’. 3274 3275 -- User Option: magit-log-margin 3276 This option specifies whether the margin is initially shown in 3277 Magit-Log mode buffers and how it is formatted. 3278 3279 The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’. 3280 3281 • If INIT is non-nil, then the margin is shown initially. 3282 • STYLE controls how to format the author or committer date. It 3283 can be one of ‘age’ (to show the age of the commit), 3284 ‘age-abbreviated’ (to abbreviate the time unit to a 3285 character), or a string (suitable for ‘format-time-string’) to 3286 show the actual date. Option 3287 ‘magit-log-margin-show-committer-date’ controls which date is 3288 being displayed. 3289 • WIDTH controls the width of the margin. This exists for 3290 forward compatibility and currently the value should not be 3291 changed. 3292 • AUTHOR controls whether the name of the author is also shown 3293 by default. 3294 • AUTHOR-WIDTH has to be an integer. When the name of the 3295 author is shown, then this specifies how much space is used to 3296 do so. 3297 3298 You can change the STYLE and AUTHOR-WIDTH of all ‘magit-INFIX-margin’ 3299 options to the same values by customizing ‘magit-log-margin’ *before* 3300 ‘magit’ is loaded. If you do that, then the respective values for the 3301 other options will default to what you have set for that variable. 3302 Likewise if you set INIT in ‘magit-log-margin’ to ‘nil’, then that is 3303 used in the default of all other options. But setting it to ‘t’, i.e. 3304 re-enforcing the default for that option, does not carry to other 3305 options. 3306 3307 -- User Option: magit-log-margin-show-committer-date 3308 This option specifies whether to show the committer date in the 3309 margin. This option only controls whether the committer date is 3310 displayed instead of the author date. Whether some date is 3311 displayed in the margin and whether the margin is displayed at all 3312 is controlled by other options. 3313 3314 ‘L’ (‘magit-margin-settings’) 3315 This transient prefix command binds the following suffix commands, 3316 each of which changes the appearance of the margin in some way. 3317 3318 In some buffers that support the margin, ‘L’ is instead bound to 3319 ‘magit-log-refresh’, but that transient features the same commands, and 3320 then some other unrelated commands. 3321 3322 ‘L L’ (‘magit-toggle-margin’) 3323 This command shows or hides the margin. 3324 3325 ‘L l’ (‘magit-cycle-margin-style’) 3326 This command cycles the style used for the margin. 3327 3328 ‘L d’ (‘magit-toggle-margin-details’) 3329 This command shows or hides details in the margin. 3330 3331 3332 File: magit.info, Node: Select from Log, Next: Reflog, Prev: Log Margin, Up: Logging 3333 3334 5.3.4 Select from Log 3335 --------------------- 3336 3337 When the user has to select a recent commit that is reachable from 3338 ‘HEAD’, using regular completion would be inconvenient (because most 3339 humans cannot remember hashes or "HEAD~5", at least not without double 3340 checking). Instead a log buffer is used to select the commit, which has 3341 the advantage that commits are presented in order and with the commit 3342 message. 3343 3344 Such selection logs are used when selecting the beginning of a rebase 3345 and when selecting the commit to be squashed into. 3346 3347 In addition to the key bindings available in all log buffers, the 3348 following additional key bindings are available in selection log 3349 buffers: 3350 3351 ‘C-c C-c’ (‘magit-log-select-pick’) 3352 Select the commit at point and act on it. Call 3353 ‘magit-log-select-pick-function’ with the selected commit as 3354 argument. 3355 3356 ‘C-c C-k’ (‘magit-log-select-quit’) 3357 Abort selecting a commit, don’t act on any commit. 3358 3359 -- User Option: magit-log-select-margin 3360 This option specifies whether the margin is initially shown in 3361 Magit-Log-Select mode buffers and how it is formatted. 3362 3363 The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’. 3364 3365 • If INIT is non-nil, then the margin is shown initially. 3366 • STYLE controls how to format the author or committer date. It 3367 can be one of ‘age’ (to show the age of the commit), 3368 ‘age-abbreviated’ (to abbreviate the time unit to a 3369 character), or a string (suitable for ‘format-time-string’) to 3370 show the actual date. Option 3371 ‘magit-log-margin-show-committer-date’ controls which date is 3372 being displayed. 3373 • WIDTH controls the width of the margin. This exists for 3374 forward compatibility and currently the value should not be 3375 changed. 3376 • AUTHOR controls whether the name of the author is also shown 3377 by default. 3378 • AUTHOR-WIDTH has to be an integer. When the name of the 3379 author is shown, then this specifies how much space is used to 3380 do so. 3381 3382 3383 File: magit.info, Node: Reflog, Next: Cherries, Prev: Select from Log, Up: Logging 3384 3385 5.3.5 Reflog 3386 ------------ 3387 3388 Also see *note (gitman)git-reflog::. 3389 3390 These reflog commands are available from the log transient. See 3391 *note Logging::. 3392 3393 ‘l r’ (‘magit-reflog-current’) 3394 Display the reflog of the current branch. 3395 3396 ‘l O’ (‘magit-reflog-other’) 3397 Display the reflog of a branch or another ref. 3398 3399 ‘l H’ (‘magit-reflog-head’) 3400 Display the ‘HEAD’ reflog. 3401 3402 -- User Option: magit-reflog-margin 3403 This option specifies whether the margin is initially shown in 3404 Magit-Reflog mode buffers and how it is formatted. 3405 3406 The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’. 3407 3408 • If INIT is non-nil, then the margin is shown initially. 3409 • STYLE controls how to format the author or committer date. It 3410 can be one of ‘age’ (to show the age of the commit), 3411 ‘age-abbreviated’ (to abbreviate the time unit to a 3412 character), or a string (suitable for ‘format-time-string’) to 3413 show the actual date. Option 3414 ‘magit-log-margin-show-committer-date’ controls which date is 3415 being displayed. 3416 • WIDTH controls the width of the margin. This exists for 3417 forward compatibility and currently the value should not be 3418 changed. 3419 • AUTHOR controls whether the name of the author is also shown 3420 by default. 3421 • AUTHOR-WIDTH has to be an integer. When the name of the 3422 author is shown, then this specifies how much space is used to 3423 do so. 3424 3425 3426 File: magit.info, Node: Cherries, Prev: Reflog, Up: Logging 3427 3428 5.3.6 Cherries 3429 -------------- 3430 3431 Cherries are commits that haven’t been applied upstream (yet), and are 3432 usually visualized using a log. Each commit is prefixed with ‘-’ if it 3433 has an equivalent in the upstream and ‘+’ if it does not, i.e., if it is 3434 a cherry. 3435 3436 The command ‘magit-cherry’ shows cherries for a single branch, but 3437 the references buffer (see *note References Buffer::) can show cherries 3438 for multiple "upstreams" at once. 3439 3440 Also see *note (gitman)git-reflog::. 3441 3442 ‘Y’ (‘magit-cherry’) 3443 Show commits that are in a certain branch but that have not been 3444 merged in the upstream branch. 3445 3446 -- User Option: magit-cherry-margin 3447 This option specifies whether the margin is initially shown in 3448 Magit-Cherry mode buffers and how it is formatted. 3449 3450 The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’. 3451 3452 • If INIT is non-nil, then the margin is shown initially. 3453 • STYLE controls how to format the author or committer date. It 3454 can be one of ‘age’ (to show the age of the commit), 3455 ‘age-abbreviated’ (to abbreviate the time unit to a 3456 character), or a string (suitable for ‘format-time-string’) to 3457 show the actual date. Option 3458 ‘magit-log-margin-show-committer-date’ controls which date is 3459 being displayed. 3460 • WIDTH controls the width of the margin. This exists for 3461 forward compatibility and currently the value should not be 3462 changed. 3463 • AUTHOR controls whether the name of the author is also shown 3464 by default. 3465 • AUTHOR-WIDTH has to be an integer. When the name of the 3466 author is shown, then this specifies how much space is used to 3467 do so. 3468 3469 3470 File: magit.info, Node: Diffing, Next: Ediffing, Prev: Logging, Up: Inspecting 3471 3472 5.4 Diffing 3473 =========== 3474 3475 The status buffer contains diffs for the staged and unstaged commits, 3476 but that obviously isn’t enough. The transient prefix command 3477 ‘magit-diff’, on ‘d’, features several suffix commands, which show a 3478 specific diff in a separate diff buffer. 3479 3480 Like other transient prefix commands, ‘magit-diff’ also features 3481 several infix arguments that can be changed before invoking one of the 3482 suffix commands. However, in the case of the diff transient, these 3483 arguments may be taken from those currently in use in the current 3484 repository’s diff buffer, depending on the value of 3485 ‘magit-prefix-use-buffer-arguments’ (see *note Transient Arguments and 3486 Buffer Variables::). 3487 3488 Also see *note (gitman)git-diff::. 3489 3490 ‘d’ (‘magit-diff’) 3491 This transient prefix command binds the following suffix commands 3492 along with the appropriate infix arguments and displays them in a 3493 temporary buffer until a suffix is invoked. 3494 3495 ‘d d’ (‘magit-diff-dwim’) 3496 Show changes for the thing at point. 3497 3498 ‘d r’ (‘magit-diff-range’) 3499 Show differences between two commits. 3500 3501 RANGE should be a range (A..B or A...B) but can also be a single 3502 commit. If one side of the range is omitted, then it defaults to 3503 ‘HEAD’. If just a commit is given, then changes in the working 3504 tree relative to that commit are shown. 3505 3506 If the region is active, use the revisions on the first and last 3507 line of the region. With a prefix argument, instead of diffing the 3508 revisions, choose a revision to view changes along, starting at the 3509 common ancestor of both revisions (i.e., use a "..." range). 3510 3511 ‘d w’ (‘magit-diff-working-tree’) 3512 Show changes between the current working tree and the ‘HEAD’ 3513 commit. With a prefix argument show changes between the working 3514 tree and a commit read from the minibuffer. 3515 3516 ‘d s’ (‘magit-diff-staged’) 3517 Show changes between the index and the ‘HEAD’ commit. With a 3518 prefix argument show changes between the index and a commit read 3519 from the minibuffer. 3520 3521 ‘d u’ (‘magit-diff-unstaged’) 3522 Show changes between the working tree and the index. 3523 3524 ‘d p’ (‘magit-diff-paths’) 3525 Show changes between any two files on disk. 3526 3527 All of the above suffix commands update the repository’s diff buffer. 3528 The diff transient also features two commands which show differences in 3529 another buffer: 3530 3531 ‘d c’ (‘magit-show-commit’) 3532 Show the commit at point. If there is no commit at point or with a 3533 prefix argument, prompt for a commit. 3534 3535 ‘d t’ (‘magit-stash-show’) 3536 Show all diffs of a stash in a buffer. 3537 3538 Two additional commands that show the diff for the file or blob that 3539 is being visited in the current buffer exists, see *note Commands for 3540 Buffers Visiting Files::. 3541 3542 * Menu: 3543 3544 * Refreshing Diffs:: 3545 * Commands Available in Diffs:: 3546 * Diff Options:: 3547 * Revision Buffer:: 3548 3549 3550 File: magit.info, Node: Refreshing Diffs, Next: Commands Available in Diffs, Up: Diffing 3551 3552 5.4.1 Refreshing Diffs 3553 ---------------------- 3554 3555 The transient prefix command ‘magit-diff-refresh’, on ‘D’, can be used 3556 to change the diff arguments used in the current buffer, without 3557 changing which diff is shown. This works in dedicated diff buffers, but 3558 also in the status buffer. 3559 3560 (There is one exception; diff arguments cannot be changed in buffers 3561 created by ‘magit-merge-preview’ because the underlying Git command does 3562 not support these arguments.) 3563 3564 ‘D’ (‘magit-diff-refresh’) 3565 This transient prefix command binds the following suffix commands 3566 along with the appropriate infix arguments and displays them in a 3567 temporary buffer until a suffix is invoked. 3568 3569 ‘D g’ (‘magit-diff-refresh’) 3570 This suffix command sets the local diff arguments for the current 3571 buffer. 3572 3573 ‘D s’ (‘magit-diff-set-default-arguments’) 3574 This suffix command sets the default diff arguments for buffers of 3575 the same type as that of the current buffer. Other existing 3576 buffers of the same type are not affected because their local 3577 values have already been initialized. 3578 3579 ‘D w’ (‘magit-diff-save-default-arguments’) 3580 This suffix command sets the default diff arguments for buffers of 3581 the same type as that of the current buffer, and saves the value 3582 for future sessions. Other existing buffers of the same type are 3583 not affected because their local values have already been 3584 initialized. 3585 3586 ‘D t’ (‘magit-diff-toggle-refine-hunk’) 3587 This command toggles hunk refinement on or off. 3588 3589 ‘D r’ (‘magit-diff-switch-range-type’) 3590 This command converts the diff range type from "revA..revB" to 3591 "revB...revA", or vice versa. 3592 3593 ‘D f’ (‘magit-diff-flip-revs’) 3594 This command swaps revisions in the diff range from "revA..revB" to 3595 "revB..revA", or vice versa. 3596 3597 ‘D F’ (‘magit-diff-toggle-file-filter’) 3598 This command toggles the file restriction of the diffs in the 3599 current buffer, allowing you to quickly switch between viewing all 3600 the changes in the commit and the restricted subset. As a special 3601 case, when this command is called from a log buffer, it toggles the 3602 file restriction in the repository’s revision buffer, which is 3603 useful when you display a revision from a log buffer that is 3604 restricted to a file or files. 3605 3606 In addition to the above transient, which allows changing any of the 3607 supported arguments, there also exist some commands that change only a 3608 particular argument. 3609 3610 ‘-’ (‘magit-diff-less-context’) 3611 This command decreases the context for diff hunks by COUNT lines. 3612 3613 ‘+’ (‘magit-diff-more-context’) 3614 This command increases the context for diff hunks by COUNT lines. 3615 3616 ‘0’ (‘magit-diff-default-context’) 3617 This command resets the context for diff hunks to the default 3618 height. 3619 3620 The following commands quickly change what diff is being displayed 3621 without having to using one of the diff transient. 3622 3623 ‘C-c C-d’ (‘magit-diff-while-committing’) 3624 While committing, this command shows the changes that are about to 3625 be committed. While amending, invoking the command again toggles 3626 between showing just the new changes or all the changes that will 3627 be committed. 3628 3629 This binding is available in the diff buffer as well as the commit 3630 message buffer. 3631 3632 ‘C-c C-b’ (‘magit-go-backward’) 3633 This command moves backward in current buffer’s history. 3634 3635 ‘C-c C-f’ (‘magit-go-forward’) 3636 This command moves forward in current buffer’s history. 3637 3638 3639 File: magit.info, Node: Commands Available in Diffs, Next: Diff Options, Prev: Refreshing Diffs, Up: Diffing 3640 3641 5.4.2 Commands Available in Diffs 3642 --------------------------------- 3643 3644 Some commands are only available if point is inside a diff. 3645 3646 ‘magit-diff-visit-file’ and related commands visit the appropriate 3647 version of the file that the diff at point is about. Likewise 3648 ‘magit-diff-visit-worktree-file’ and related commands visit the worktree 3649 version of the file that the diff at point is about. See *note Visiting 3650 Files and Blobs from a Diff:: for more information and the key bindings. 3651 3652 ‘C-c C-t’ (‘magit-diff-trace-definition’) 3653 This command shows a log for the definition at point. 3654 3655 -- User Option: magit-log-trace-definition-function 3656 The function specified by this option is used by 3657 ‘magit-log-trace-definition’ to determine the function at point. 3658 For major-modes that have special needs, you could set the local 3659 value using the mode’s hook. 3660 3661 ‘C-c C-e’ (‘magit-diff-edit-hunk-commit’) 3662 From a hunk, this command edits the respective commit and visits 3663 the file. 3664 3665 First it visits the file being modified by the hunk at the correct 3666 location using ‘magit-diff-visit-file’. This actually visits a 3667 blob. When point is on a diff header, not within an individual 3668 hunk, then this visits the blob the first hunk is about. 3669 3670 Then it invokes ‘magit-edit-line-commit’, which uses an interactive 3671 rebase to make the commit editable, or if that is not possible 3672 because the commit is not reachable from ‘HEAD’ by checking out 3673 that commit directly. This also causes the actual worktree file to 3674 be visited. 3675 3676 Neither the blob nor the file buffer are killed when finishing the 3677 rebase. If that is undesirable, then it might be better to use 3678 ‘magit-rebase-edit-commit’ instead of this command. 3679 3680 ‘j’ (‘magit-jump-to-diffstat-or-diff’) 3681 This command jumps to the diffstat or diff. When point is on a 3682 file inside the diffstat section, then jump to the respective diff 3683 section. Otherwise, jump to the diffstat section or a child 3684 thereof. 3685 3686 The next two commands are not specific to Magit-Diff mode (or and 3687 Magit buffer for that matter), but it might be worth pointing out that 3688 they are available here too. 3689 3690 ‘<SPC>’ (‘scroll-up’) 3691 This command scrolls text upward. 3692 3693 ‘<DEL>’ (‘scroll-down’) 3694 This command scrolls text downward. 3695 3696 3697 File: magit.info, Node: Diff Options, Next: Revision Buffer, Prev: Commands Available in Diffs, Up: Diffing 3698 3699 5.4.3 Diff Options 3700 ------------------ 3701 3702 -- User Option: magit-diff-refine-hunk 3703 Whether to show word-granularity differences within diff hunks. 3704 3705 • ‘nil’ Never show fine differences. 3706 • ‘t’ Show fine differences for the current diff hunk only. 3707 • ‘all’ Show fine differences for all displayed diff hunks. 3708 3709 -- User Option: magit-diff-refine-ignore-whitespace 3710 Whether to ignore whitespace changes in word-granularity 3711 differences. 3712 3713 -- User Option: magit-diff-adjust-tab-width 3714 Whether to adjust the width of tabs in diffs. 3715 3716 Determining the correct width can be expensive if it requires 3717 opening large and/or many files, so the widths are cached in the 3718 variable ‘magit-diff--tab-width-cache’. Set that to nil to 3719 invalidate the cache. 3720 3721 • ‘nil’ Never adjust tab width. Use ‘tab-width’s value from the 3722 Magit buffer itself instead. 3723 3724 • ‘t’ If the corresponding file-visiting buffer exits, then use 3725 ‘tab-width’’s value from that buffer. Doing this is cheap, so 3726 this value is used even if a corresponding cache entry exists. 3727 3728 • ‘always’ If there is no such buffer, then temporarily visit 3729 the file to determine the value. 3730 3731 • NUMBER Like ‘always’, but don’t visit files larger than NUMBER 3732 bytes. 3733 3734 -- User Option: magit-diff-paint-whitespace 3735 Specify where to highlight whitespace errors. 3736 3737 See ‘magit-diff-highlight-trailing’, 3738 ‘magit-diff-highlight-indentation’. The symbol ‘t’ means in all 3739 diffs, ‘status’ means only in the status buffer, and nil means 3740 nowhere. 3741 3742 • ‘nil’ Never highlight whitespace errors. 3743 • ‘t’ Highlight whitespace errors everywhere. 3744 • ‘uncommitted’ Only highlight whitespace errors in diffs 3745 showing uncommitted changes. For backward compatibility 3746 ‘status’ is treated as a synonym. 3747 3748 -- User Option: magit-diff-paint-whitespace-lines 3749 Specify in what kind of lines to highlight whitespace errors. 3750 3751 • ‘t’ Highlight only in added lines. 3752 • ‘both’ Highlight in added and removed lines. 3753 • ‘all’ Highlight in added, removed and context lines. 3754 3755 -- User Option: magit-diff-highlight-trailing 3756 Whether to highlight whitespace at the end of a line in diffs. 3757 Used only when ‘magit-diff-paint-whitespace’ is non-nil. 3758 3759 -- User Option: magit-diff-highlight-indentation 3760 This option controls whether to highlight the indentation in case 3761 it used the "wrong" indentation style. Indentation is only 3762 highlighted if ‘magit-diff-paint-whitespace’ is also non-nil. 3763 3764 The value is an alist of the form ‘((REGEXP . INDENT)...)’. The 3765 path to the current repository is matched against each element in 3766 reverse order. Therefore if a REGEXP matches, then earlier 3767 elements are not tried. 3768 3769 If the used INDENT is ‘tabs’, highlight indentation with tabs. If 3770 INDENT is an integer, highlight indentation with at least that many 3771 spaces. Otherwise, highlight neither. 3772 3773 -- User Option: magit-diff-hide-trailing-cr-characters 3774 Whether to hide ^M characters at the end of a line in diffs. 3775 3776 -- User Option: magit-diff-highlight-hunk-region-functions 3777 This option specifies the functions used to highlight the 3778 hunk-internal region. 3779 3780 ‘magit-diff-highlight-hunk-region-dim-outside’ overlays the outside 3781 of the hunk internal selection with a face that causes the added 3782 and removed lines to have the same background color as context 3783 lines. This function should not be removed from the value of this 3784 option. 3785 3786 ‘magit-diff-highlight-hunk-region-using-overlays’ and 3787 ‘magit-diff-highlight-hunk-region-using-underline’ emphasize the 3788 region by placing delimiting horizontal lines before and after it. 3789 Both of these functions have glitches which cannot be fixed due to 3790 limitations of Emacs’ display engine. For more information see 3791 <https://github.com/magit/magit/issues/2758> ff. 3792 3793 Instead of, or in addition to, using delimiting horizontal lines, 3794 to emphasize the boundaries, you may wish to emphasize the text 3795 itself, using ‘magit-diff-highlight-hunk-region-using-face’. 3796 3797 In terminal frames it’s not possible to draw lines as the overlay 3798 and underline variants normally do, so there they fall back to 3799 calling the face function instead. 3800 3801 -- User Option: magit-diff-unmarked-lines-keep-foreground 3802 This option controls whether added and removed lines outside the 3803 hunk-internal region only lose their distinct background color or 3804 also the foreground color. Whether the outside of the region is 3805 dimmed at all depends on 3806 ‘magit-diff-highlight-hunk-region-functions’. 3807 3808 -- User Option: magit-diff-extra-stat-arguments 3809 This option specifies additional arguments to be used alongside 3810 ‘--stat’. 3811 3812 The value is a list of zero or more arguments or a function that 3813 takes no argument and returns such a list. These arguments are 3814 allowed here: ‘--stat-width’, ‘--stat-name-width’, 3815 ‘--stat-graph-width’ and ‘--compact-summary’. Also see *note 3816 (gitman)git-diff::. 3817 3818 3819 File: magit.info, Node: Revision Buffer, Prev: Diff Options, Up: Diffing 3820 3821 5.4.4 Revision Buffer 3822 --------------------- 3823 3824 -- User Option: magit-revision-insert-related-refs 3825 Whether to show related branches in revision buffers. 3826 3827 • ‘nil’ Don’t show any related branches. 3828 • ‘t’ Show related local branches. 3829 • ‘all’ Show related local and remote branches. 3830 • ‘mixed’ Show all containing branches and local merged 3831 branches. 3832 3833 -- User Option: magit-revision-show-gravatars 3834 Whether to show gravatar images in revision buffers. 3835 3836 If ‘nil’, then don’t insert any gravatar images. If ‘t’, then 3837 insert both images. If ‘author’ or ‘committer’, then insert only 3838 the respective image. 3839 3840 If you have customized the option ‘magit-revision-headers-format’ 3841 and want to insert the images then you might also have to specify 3842 where to do so. In that case the value has to be a cons-cell of 3843 two regular expressions. The car specifies where to insert the 3844 author’s image. The top half of the image is inserted right after 3845 the matched text, the bottom half on the next line in the same 3846 column. The cdr specifies where to insert the committer’s image, 3847 accordingly. Either the car or the cdr may be nil." 3848 3849 -- User Option: magit-revision-use-hash-sections 3850 Whether to turn hashes inside the commit message into sections. 3851 3852 If non-nil, then hashes inside the commit message are turned into 3853 ‘commit’ sections. There is a trade off to be made between 3854 performance and reliability: 3855 3856 • ‘slow’ calls git for every word to be absolutely sure. 3857 • ‘quick’ skips words less than seven characters long. 3858 • ‘quicker’ additionally skips words that don’t contain a 3859 number. 3860 • ‘quickest’ uses all words that are at least seven characters 3861 long and which contain at least one number as well as at least 3862 one letter. 3863 3864 If nil, then no hashes are turned into sections, but you can still 3865 visit the commit at point using "RET". 3866 3867 The diffs shown in the revision buffer may be automatically 3868 restricted to a subset of the changed files. If the revision buffer is 3869 displayed from a log buffer, the revision buffer will share the same 3870 file restriction as that log buffer (also see the command 3871 ‘magit-diff-toggle-file-filter’). 3872 3873 -- User Option: magit-revision-filter-files-on-follow 3874 Whether showing a commit from a log buffer honors the log’s file 3875 filter when the log arguments include ‘--follow’. 3876 3877 When this option is nil, displaying a commit from a log ignores the 3878 log’s file filter if the log arguments include ‘--follow’. Doing 3879 so avoids showing an empty diff in revision buffers for commits 3880 before a rename event. In such cases, the ‘--patch’ argument of 3881 the log transient can be used to show the file-restricted diffs 3882 inline. 3883 3884 Set this option to non-nil to keep the log’s file restriction even 3885 if ‘--follow’ is present in the log arguments. 3886 3887 If the revision buffer is not displayed from a log buffer, the file 3888 restriction is determined as usual (see *note Transient Arguments and 3889 Buffer Variables::). 3890 3891 3892 File: magit.info, Node: Ediffing, Next: References Buffer, Prev: Diffing, Up: Inspecting 3893 3894 5.5 Ediffing 3895 ============ 3896 3897 This section describes how to enter Ediff from Magit buffers. For 3898 information on how to use Ediff itself, see *note (ediff)Top::. 3899 3900 ‘e’ (‘magit-ediff-dwim’) 3901 Compare, stage, or resolve using Ediff. 3902 3903 This command tries to guess what file, and what commit or range the 3904 user wants to compare, stage, or resolve using Ediff. It might 3905 only be able to guess either the file, or range/commit, in which 3906 case the user is asked about the other. It might not always guess 3907 right, in which case the appropriate ‘magit-ediff-*’ command has to 3908 be used explicitly. If it cannot read the user’s mind at all, then 3909 it asks the user for a command to run. 3910 3911 ‘E’ (‘magit-ediff’) 3912 This transient prefix command binds the following suffix commands 3913 and displays them in a temporary buffer until a suffix is invoked. 3914 3915 ‘E r’ (‘magit-ediff-compare’) 3916 Compare two revisions of a file using Ediff. 3917 3918 If the region is active, use the revisions on the first and last 3919 line of the region. With a prefix argument, instead of diffing the 3920 revisions, choose a revision to view changes along, starting at the 3921 common ancestor of both revisions (i.e., use a "..." range). 3922 3923 ‘E m’ (‘magit-ediff-resolve-rest’) 3924 This command allows you to resolve outstanding conflicts in the 3925 file at point using Ediff. If there is no file at point or if it 3926 doesn’t have any unmerged changes, then this command prompts for a 3927 file. 3928 3929 Provided that the value of ‘merge.conflictstyle’ is ‘diff3’, you 3930 can view the file’s merge-base revision using ‘/’ in the Ediff 3931 control buffer. 3932 3933 The A, B and Ancestor buffers are constructed from the conflict 3934 markers in the worktree file. Because you and/or Git may have 3935 already resolved some conflicts, that means that these buffers may 3936 not contain the actual versions from the respective blobs. 3937 3938 ‘E M’ (‘magit-ediff-resolve-all’) 3939 This command allows you to resolve all conflicts in the file at 3940 point using Ediff. If there is no file at point or if it doesn’t 3941 have any unmerged changes, then this command prompts for a file. 3942 3943 Provided that the value of ‘merge.conflictstyle’ is ‘diff3’, you 3944 can view the file’s merge-base revision using ‘/’ in the Ediff 3945 control buffer. 3946 3947 First the file in the worktree is moved aside, appending the suffix 3948 ‘.ORIG’, so that you could later go back to that version. Then it 3949 is reconstructed from the two sides of the conflict and the 3950 merge-base, if available. 3951 3952 It would be nice if the worktree file were just used as-is, but 3953 Ediff does not support that. This means that all conflicts, that 3954 Git has already resolved, are restored. On the other hand Ediff 3955 also tries to resolve conflicts, and in many cases Ediff and Git 3956 should produce similar results. 3957 3958 However if you have already resolved some conflicts manually, then 3959 those changes are discarded (though you can recover them from the 3960 backup file). In such cases ‘magit-ediff-resolve-rest’ might be 3961 more suitable. 3962 3963 The advantage that this command has over ‘magit-ediff-resolve-rest’ 3964 is that the A, B and Ancestor buffers correspond to blobs from the 3965 respective commits, allowing you to inspect a side in context and 3966 to use Magit commands in these buffers to do so. Blame and log 3967 commands are particularly useful here. 3968 3969 ‘E t’ (‘magit-git-mergetool’) 3970 This command does not actually use Ediff. While it serves the same 3971 purpose as ‘magit-ediff-resolve-rest’, it uses ‘git mergetool 3972 --gui’ to resolve conflicts. 3973 3974 With a prefix argument this acts as a transient prefix command, 3975 allowing the user to select the mergetool and change some settings. 3976 3977 ‘E s’ (‘magit-ediff-stage’) 3978 Stage and unstage changes to a file using Ediff, defaulting to the 3979 file at point. 3980 3981 ‘E u’ (‘magit-ediff-show-unstaged’) 3982 Show unstaged changes to a file using Ediff. 3983 3984 ‘E i’ (‘magit-ediff-show-staged’) 3985 Show staged changes to a file using Ediff. 3986 3987 ‘E w’ (‘magit-ediff-show-working-tree’) 3988 Show changes in a file between ‘HEAD’ and working tree using Ediff. 3989 3990 ‘E c’ (‘magit-ediff-show-commit’) 3991 Show changes to a file introduced by a commit using Ediff. 3992 3993 ‘E z’ (‘magit-ediff-show-stash’) 3994 Show changes to a file introduced by a stash using Ediff. 3995 3996 -- User Option: magit-ediff-dwim-resolve-function 3997 This option controls which function ‘magit-ediff-dwim’ uses to 3998 resolve conflicts. One of ‘magit-ediff-resolve-rest’, 3999 ‘magit-ediff-resolve-all’ or ‘magit-git-mergetool’; which are all 4000 discussed above. 4001 4002 -- User Option: magit-ediff-dwim-show-on-hunks 4003 This option controls what command ‘magit-ediff-dwim’ calls when 4004 point is on uncommitted hunks. When nil, always run 4005 ‘magit-ediff-stage’. Otherwise, use ‘magit-ediff-show-staged’ and 4006 ‘magit-ediff-show-unstaged’ to show staged and unstaged changes, 4007 respectively. 4008 4009 -- User Option: magit-ediff-show-stash-with-index 4010 This option controls whether ‘magit-ediff-show-stash’ includes a 4011 buffer containing the file’s state in the index at the time the 4012 stash was created. This makes it possible to tell which changes in 4013 the stash were staged. 4014 4015 -- User Option: magit-ediff-quit-hook 4016 This hook is run after quitting an Ediff session that was created 4017 using a Magit command. The hook functions are run inside the Ediff 4018 control buffer, and should not change the current buffer. 4019 4020 This is similar to ‘ediff-quit-hook’ but takes the needs of Magit 4021 into account. The regular ‘ediff-quit-hook’ is ignored by Ediff 4022 sessions that were created using a Magit command. 4023 4024 4025 File: magit.info, Node: References Buffer, Next: Bisecting, Prev: Ediffing, Up: Inspecting 4026 4027 5.6 References Buffer 4028 ===================== 4029 4030 ‘y’ (‘magit-show-refs’) 4031 This command lists branches and tags in a dedicated buffer. 4032 4033 However if this command is invoked again from this buffer or if it 4034 is invoked with a prefix argument, then it acts as a transient 4035 prefix command, which binds the following suffix commands and some 4036 infix arguments. 4037 4038 All of the following suffix commands list exactly the same branches 4039 and tags. The only difference the optional feature that can be enabled 4040 by changing the value of ‘magit-refs-show-commit-count’ (see below). 4041 These commands specify a different branch or commit against which all 4042 the other references are compared. 4043 4044 ‘y y’ (‘magit-show-refs-head’) 4045 This command lists branches and tags in a dedicated buffer. Each 4046 reference is being compared with ‘HEAD’. 4047 4048 ‘y c’ (‘magit-show-refs-current’) 4049 This command lists branches and tags in a dedicated buffer. Each 4050 reference is being compared with the current branch or ‘HEAD’ if it 4051 is detached. 4052 4053 ‘y o’ (‘magit-show-refs-other’) 4054 This command lists branches and tags in a dedicated buffer. Each 4055 reference is being compared with a branch read from the user. 4056 4057 ‘y r’ (‘magit-refs-set-show-commit-count’) 4058 This command changes for which refs the commit count is shown. 4059 4060 -- User Option: magit-refs-show-commit-count 4061 Whether to show commit counts in Magit-Refs mode buffers. 4062 4063 • ‘all’ Show counts for branches and tags. 4064 • ‘branch’ Show counts for branches only. 4065 • ‘nil’ Never show counts. 4066 4067 The default is ‘nil’ because anything else can be very expensive. 4068 4069 -- User Option: magit-refs-pad-commit-counts 4070 Whether to pad all commit counts on all sides in Magit-Refs mode 4071 buffers. 4072 4073 If this is nil, then some commit counts are displayed right next to 4074 one of the branches that appear next to the count, without any 4075 space in between. This might look bad if the branch name faces 4076 look too similar to ‘magit-dimmed’. 4077 4078 If this is non-nil, then spaces are placed on both sides of all 4079 commit counts. 4080 4081 -- User Option: magit-refs-show-remote-prefix 4082 Whether to show the remote prefix in lists of remote branches. 4083 4084 Showing the prefix is redundant because the name of the remote is 4085 already shown in the heading preceding the list of its branches. 4086 4087 -- User Option: magit-refs-primary-column-width 4088 Width of the primary column in ‘magit-refs-mode’ buffers. The 4089 primary column is the column that contains the name of the branch 4090 that the current row is about. 4091 4092 If this is an integer, then the column is that many columns wide. 4093 Otherwise it has to be a cons-cell of two integers. The first 4094 specifies the minimal width, the second the maximal width. In that 4095 case the actual width is determined using the length of the names 4096 of the shown local branches. (Remote branches and tags are not 4097 taken into account when calculating to optimal width.) 4098 4099 -- User Option: magit-refs-focus-column-width 4100 Width of the focus column in ‘magit-refs-mode’ buffers. 4101 4102 The focus column is the first column, which marks one branch 4103 (usually the current branch) as the focused branch using ‘*’ or 4104 ‘@’. For each other reference, this column optionally shows how 4105 many commits it is ahead of the focused branch and ‘<’, or if it 4106 isn’t ahead then the commits it is behind and ‘>’, or if it isn’t 4107 behind either, then a ‘=’. 4108 4109 This column may also display only ‘*’ or ‘@’ for the focused 4110 branch, in which case this option is ignored. Use ‘L v’ to change 4111 the verbosity of this column. 4112 4113 -- User Option: magit-refs-margin 4114 This option specifies whether the margin is initially shown in 4115 Magit-Refs mode buffers and how it is formatted. 4116 4117 The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’. 4118 4119 • If INIT is non-nil, then the margin is shown initially. 4120 • STYLE controls how to format the author or committer date. It 4121 can be one of ‘age’ (to show the age of the commit), 4122 ‘age-abbreviated’ (to abbreviate the time unit to a 4123 character), or a string (suitable for ‘format-time-string’) to 4124 show the actual date. Option 4125 ‘magit-log-margin-show-committer-date’ controls which date is 4126 being displayed. 4127 • WIDTH controls the width of the margin. This exists for 4128 forward compatibility and currently the value should not be 4129 changed. 4130 • AUTHOR controls whether the name of the author is also shown 4131 by default. 4132 • AUTHOR-WIDTH has to be an integer. When the name of the 4133 author is shown, then this specifies how much space is used to 4134 do so. 4135 4136 -- User Option: magit-refs-margin-for-tags 4137 This option specifies whether to show information about tags in the 4138 margin. This is disabled by default because it is slow if there 4139 are many tags. 4140 4141 The following variables control how individual refs are displayed. 4142 If you change one of these variables (especially the "%c" part), then 4143 you should also change the others to keep things aligned. The following 4144 %-sequences are supported: 4145 4146 • ‘%a’ Number of commits this ref has over the one we compare to. 4147 • ‘%b’ Number of commits the ref we compare to has over this one. 4148 • ‘%c’ Number of commits this ref has over the one we compare to. 4149 For the ref which all other refs are compared this is instead "@", 4150 if it is the current branch, or "#" otherwise. 4151 • ‘%C’ For the ref which all other refs are compared this is "@", if 4152 it is the current branch, or "#" otherwise. For all other refs " 4153 ". 4154 • ‘%h’ Hash of this ref’s tip. 4155 • ‘%m’ Commit summary of the tip of this ref. 4156 • ‘%n’ Name of this ref. 4157 • ‘%u’ Upstream of this local branch. 4158 • ‘%U’ Upstream of this local branch and additional local vs. 4159 upstream information. 4160 4161 -- User Option: magit-refs-filter-alist 4162 The purpose of this option is to forgo displaying certain refs 4163 based on their name. If you want to not display any refs of a 4164 certain type, then you should remove the appropriate function from 4165 ‘magit-refs-sections-hook’ instead. 4166 4167 This alist controls which tags and branches are omitted from being 4168 displayed in ‘magit-refs-mode’ buffers. If it is ‘nil’, then all 4169 refs are displayed (subject to ‘magit-refs-sections-hook’). 4170 4171 All keys are tried in order until one matches. Then its value is 4172 used and subsequent elements are ignored. If the value is non-nil, 4173 then the reference is displayed, otherwise it is not. If no 4174 element matches, then the reference is displayed. 4175 4176 A key can either be a regular expression that the refname has to 4177 match, or a function that takes the refname as only argument and 4178 returns a boolean. A remote branch such as "origin/master" is 4179 displayed as just "master", however for this comparison the former 4180 is used. 4181 4182 ‘<RET>’ (‘magit-visit-ref’) 4183 This command visits the reference or revision at point in another 4184 buffer. If there is no revision at point or with a prefix argument 4185 then it prompts for a revision. 4186 4187 This command behaves just like ‘magit-show-commit’ as described 4188 above, except if point is on a reference in a ‘magit-refs-mode’ 4189 buffer, in which case the behavior may be different, but only if 4190 you have customized the option ‘magit-visit-ref-behavior’. 4191 4192 -- User Option: magit-visit-ref-behavior 4193 This option controls how ‘magit-visit-ref’ behaves in 4194 ‘magit-refs-mode’ buffers. 4195 4196 By default ‘magit-visit-ref’ behaves like ‘magit-show-commit’, in 4197 all buffers, including ‘magit-refs-mode’ buffers. When the type of 4198 the section at point is ‘commit’ then "RET" is bound to 4199 ‘magit-show-commit’, and when the type is either ‘branch’ or ‘tag’ 4200 then it is bound to ‘magit-visit-ref’. 4201 4202 "RET" is one of Magit’s most essential keys and at least by default 4203 it should behave consistently across all of Magit, especially 4204 because users quickly learn that it does something very harmless; 4205 it shows more information about the thing at point in another 4206 buffer. 4207 4208 However "RET" used to behave differently in ‘magit-refs-mode’ 4209 buffers, doing surprising things, some of which cannot really be 4210 described as "visit this thing". If you’ve grown accustomed this 4211 behavior, you can restore it by adding one or more of the below 4212 symbols to the value of this option. But keep in mind that by 4213 doing so you don’t only introduce inconsistencies, you also lose 4214 some functionality and might have to resort to ‘M-x 4215 magit-show-commit’ to get it back. 4216 4217 ‘magit-visit-ref’ looks for these symbols in the order in which 4218 they are described here. If the presence of a symbol applies to 4219 the current situation, then the symbols that follow do not affect 4220 the outcome. 4221 4222 • ‘focus-on-ref’ 4223 4224 With a prefix argument update the buffer to show commit counts 4225 and lists of cherry commits relative to the reference at point 4226 instead of relative to the current buffer or ‘HEAD’. 4227 4228 Instead of adding this symbol, consider pressing "C-u y o 4229 RET". 4230 4231 • ‘create-branch’ 4232 4233 If point is on a remote branch, then create a new local branch 4234 with the same name, use the remote branch as its upstream, and 4235 then check out the local branch. 4236 4237 Instead of adding this symbol, consider pressing "b c RET 4238 RET", like you would do in other buffers. 4239 4240 • ‘checkout-any’ 4241 4242 Check out the reference at point. If that reference is a tag 4243 or a remote branch, then this results in a detached ‘HEAD’. 4244 4245 Instead of adding this symbol, consider pressing "b b RET", 4246 like you would do in other buffers. 4247 4248 • ‘checkout-branch’ 4249 4250 Check out the local branch at point. 4251 4252 Instead of adding this symbol, consider pressing "b b RET", 4253 like you would do in other buffers. 4254 4255 * Menu: 4256 4257 * References Sections:: 4258 4259 4260 File: magit.info, Node: References Sections, Up: References Buffer 4261 4262 5.6.1 References Sections 4263 ------------------------- 4264 4265 The contents of references buffers is controlled using the hook 4266 ‘magit-refs-sections-hook’. See *note Section Hooks:: to learn about 4267 such hooks and how to customize them. All of the below functions are 4268 members of the default value. Note that it makes much less sense to 4269 customize this hook than it does for the respective hook used for the 4270 status buffer. 4271 4272 -- User Option: magit-refs-sections-hook 4273 Hook run to insert sections into a references buffer. 4274 4275 -- Function: magit-insert-local-branches 4276 Insert sections showing all local branches. 4277 4278 -- Function: magit-insert-remote-branches 4279 Insert sections showing all remote-tracking branches. 4280 4281 -- Function: magit-insert-tags 4282 Insert sections showing all tags. 4283 4284 4285 File: magit.info, Node: Bisecting, Next: Visiting Files and Blobs, Prev: References Buffer, Up: Inspecting 4286 4287 5.7 Bisecting 4288 ============= 4289 4290 Also see *note (gitman)git-bisect::. 4291 4292 ‘B’ (‘magit-bisect’) 4293 This transient prefix command binds the following suffix commands 4294 and displays them in a temporary buffer until a suffix is invoked. 4295 4296 When bisecting is not in progress, then the transient features the 4297 following suffix commands. 4298 4299 ‘B B’ (‘magit-bisect-start’) 4300 Start a bisect session. 4301 4302 Bisecting a bug means to find the commit that introduced it. This 4303 command starts such a bisect session by asking for a known good 4304 commit and a known bad commit. If you’re bisecting a change that 4305 isn’t a regression, you can select alternate terms that are 4306 conceptually more fitting than "bad" and "good", but the infix 4307 arguments to do so are disabled by default. 4308 4309 ‘B s’ (‘magit-bisect-run’) 4310 Bisect automatically by running commands after each step. 4311 4312 When bisecting in progress, then the transient instead features the 4313 following suffix commands. 4314 4315 ‘B b’ (‘magit-bisect-bad’) 4316 Mark the current commit as bad. Use this after you have asserted 4317 that the commit does contain the bug in question. 4318 4319 ‘B g’ (‘magit-bisect-good’) 4320 Mark the current commit as good. Use this after you have asserted 4321 that the commit does not contain the bug in question. 4322 4323 ‘B m’ (‘magit-bisect-mark’) 4324 Mark the current commit with one of the bisect terms. This command 4325 provides an alternative to ‘magit-bisect-bad’ and 4326 ‘magit-bisect-good’ and is useful when using terms other than "bad" 4327 and "good". This suffix is disabled by default. 4328 4329 ‘B k’ (‘magit-bisect-skip’) 4330 Skip the current commit. Use this if for some reason the current 4331 commit is not a good one to test. This command lets Git choose a 4332 different one. 4333 4334 ‘B r’ (‘magit-bisect-reset’) 4335 After bisecting, cleanup bisection state and return to original 4336 ‘HEAD’. 4337 4338 By default the status buffer shows information about the ongoing 4339 bisect session. 4340 4341 -- User Option: magit-bisect-show-graph 4342 This option controls whether a graph is displayed for the log of 4343 commits that still have to be bisected. 4344 4345 4346 File: magit.info, Node: Visiting Files and Blobs, Next: Blaming, Prev: Bisecting, Up: Inspecting 4347 4348 5.8 Visiting Files and Blobs 4349 ============================ 4350 4351 Magit provides several commands that visit a file or blob (the version 4352 of a file that is stored in a certain commit). Actually it provides 4353 several *groups* of such commands and the several *variants* within each 4354 group. 4355 4356 Also see *note Commands for Buffers Visiting Files::. 4357 4358 * Menu: 4359 4360 * General-Purpose Visit Commands:: 4361 * Visiting Files and Blobs from a Diff:: 4362 4363 4364 File: magit.info, Node: General-Purpose Visit Commands, Next: Visiting Files and Blobs from a Diff, Up: Visiting Files and Blobs 4365 4366 5.8.1 General-Purpose Visit Commands 4367 ------------------------------------ 4368 4369 These commands can be used anywhere to open any blob. Currently no keys 4370 are bound to these commands by default, but that is likely to change. 4371 4372 -- Command: magit-find-file 4373 This command reads a filename and revision from the user and visits 4374 the respective blob in a buffer. The buffer is displayed in the 4375 selected window. 4376 4377 -- Command: magit-find-file-other-window 4378 This command reads a filename and revision from the user and visits 4379 the respective blob in a buffer. The buffer is displayed in 4380 another window. 4381 4382 -- Command: magit-find-file-other-frame 4383 This command reads a filename and revision from the user and visits 4384 the respective blob in a buffer. The buffer is displayed in 4385 another frame. 4386 4387 4388 File: magit.info, Node: Visiting Files and Blobs from a Diff, Prev: General-Purpose Visit Commands, Up: Visiting Files and Blobs 4389 4390 5.8.2 Visiting Files and Blobs from a Diff 4391 ------------------------------------------ 4392 4393 These commands can only be used when point is inside a diff. 4394 4395 ‘<RET>’ (‘magit-diff-visit-file’) 4396 This command visits the appropriate version of the file that the 4397 diff at point is about. 4398 4399 This commands visits the worktree version of the appropriate file. 4400 The location of point inside the diff determines which file is 4401 being visited. The visited version depends on what changes the 4402 diff is about. 4403 4404 1. If the diff shows uncommitted changes (i.e., staged or 4405 unstaged changes), then visit the file in the working tree 4406 (i.e., the same "real" file that ‘find-file’ would visit. In 4407 all other cases visit a "blob" (i.e., the version of a file as 4408 stored in some commit). 4409 4410 2. If point is on a removed line, then visit the blob for the 4411 first parent of the commit that removed that line, i.e., the 4412 last commit where that line still exists. 4413 4414 3. If point is on an added or context line, then visit the blob 4415 that adds that line, or if the diff shows from more than a 4416 single commit, then visit the blob from the last of these 4417 commits. 4418 4419 In the file-visiting buffer this command goes to the line that 4420 corresponds to the line that point is on in the diff. 4421 4422 The buffer is displayed in the selected window. With a prefix 4423 argument the buffer is displayed in another window instead. 4424 4425 -- User Option: magit-diff-visit-previous-blob 4426 This option controls whether ‘magit-diff-visit-file’ may visit the 4427 previous blob. When this is ‘t’ (the default) and point is on a 4428 removed line in a diff for a committed change, then 4429 ‘magit-diff-visit-file’ visits the blob from the last revision 4430 which still had that line. 4431 4432 Currently this is only supported for committed changes, for staged 4433 and unstaged changes ‘magit-diff-visit-file’ always visits the file 4434 in the working tree. 4435 4436 ‘C-<return>’ (‘magit-diff-visit-file-worktree’) 4437 This command visits the worktree version of the appropriate file. 4438 The location of point inside the diff determines which file is 4439 being visited. Unlike ‘magit-diff-visit-file’ it always visits the 4440 "real" file in the working tree, i.e the "current version" of the 4441 file. 4442 4443 In the file-visiting buffer this command goes to the line that 4444 corresponds to the line that point is on in the diff. Lines that 4445 were added or removed in the working tree, the index and other 4446 commits in between are automatically accounted for. 4447 4448 The buffer is displayed in the selected window. With a prefix 4449 argument the buffer is displayed in another window instead. 4450 4451 Variants of the above two commands exist that instead visit the file 4452 in another window or in another frame. If you prefer such behavior, 4453 then you may want to change the above key bindings, but note that the 4454 above commands also use another window when invoked with a prefix 4455 argument. 4456 4457 -- Command: magit-diff-visit-file-other-window 4458 -- Command: magit-diff-visit-file-other-frame 4459 -- Command: magit-diff-visit-worktree-file-other-window 4460 -- Command: magit-diff-visit-worktree-file-other-frame 4461 4462 4463 File: magit.info, Node: Blaming, Prev: Visiting Files and Blobs, Up: Inspecting 4464 4465 5.9 Blaming 4466 =========== 4467 4468 Also see *note (gitman)git-blame::. 4469 4470 To start blaming, invoke the ‘magit-file-dispatch’ transient prefix 4471 command. When using the default key bindings, that can be done by 4472 pressing ‘C-c M-g’. When using the recommended bindings, this command 4473 is instead bound to ‘C-c f’. Also see *note Global Bindings::. 4474 4475 The blaming suffix commands can be invoked directly from the file 4476 dispatch transient. However if you want to set an infix argument, then 4477 you have to enter the blaming sub-prefix first. 4478 4479 ‘C-c f B’ (‘magit-blame’) 4480 ‘C-c f b’ (‘magit-blame-addition’) 4481 ‘C-c f B b’ 4482 ‘C-c f r’ (‘magit-blame-removal’) 4483 ‘C-c f B r’ 4484 ‘C-c f f’ (‘magit-blame-reverse’) 4485 ‘C-c f B f’ 4486 ‘C-c f e’ (‘magit-blame-echo’) 4487 ‘C-c f B e’ 4488 ‘C-c f q’ (‘magit-blame-quit’) 4489 ‘C-c f B q’ 4490 Each of these commands is documented individually right below, 4491 alongside their default key bindings. The bindings shown above are 4492 the recommended bindings, which you can enable by following the 4493 instructions in *note Global Bindings::. 4494 4495 ‘C-c M-g B’ (‘magit-blame’) 4496 This transient prefix command binds the following suffix commands 4497 along with the appropriate infix arguments and displays them in a 4498 temporary buffer until a suffix is invoked. 4499 4500 Note that not all of the following suffixes are available at all 4501 times. For example if ‘magit-blame-mode’ is not enabled, then the 4502 command whose purpose is to turn off that mode would not be of any use 4503 and therefore isn’t available. 4504 4505 ‘C-c M-g b’ (‘magit-blame-addition’) 4506 ‘C-c M-g B b’ 4507 This command augments each line or chunk of lines in the current 4508 file-visiting or blob-visiting buffer with information about what 4509 commits last touched these lines. 4510 4511 If the buffer visits a revision of that file, then history up to 4512 that revision is considered. Otherwise, the file’s full history is 4513 considered, including uncommitted changes. 4514 4515 If Magit-Blame mode is already turned on in the current buffer then 4516 blaming is done recursively, by visiting REVISION:FILE (using 4517 ‘magit-find-file’), where REVISION is a parent of the revision that 4518 added the current line or chunk of lines. 4519 4520 ‘C-c M-g r’ (‘magit-blame-removal’) 4521 ‘C-c M-g B r’ 4522 This command augments each line or chunk of lines in the current 4523 blob-visiting buffer with information about the revision that 4524 removes it. It cannot be used in file-visiting buffers. 4525 4526 Like ‘magit-blame-addition’, this command can be used recursively. 4527 4528 ‘C-c M-g f’ (‘magit-blame-reverse’) 4529 ‘C-c M-g B f’ 4530 This command augments each line or chunk of lines in the current 4531 file-visiting or blob-visiting buffer with information about the 4532 last revision in which a line still existed. 4533 4534 Like ‘magit-blame-addition’, this command can be used recursively. 4535 4536 ‘C-c M-g e’ (‘magit-blame-echo’) 4537 ‘C-c M-g B e’ 4538 This command is like ‘magit-blame-addition’ except that it doesn’t 4539 turn on ‘read-only-mode’ and that it initially uses the 4540 visualization style specified by option ‘magit-blame-echo-style’. 4541 4542 The following key bindings are available when Magit-Blame mode is 4543 enabled and Read-Only mode is not enabled. These commands are also 4544 available in other buffers; here only the behavior is described that is 4545 relevant in file-visiting buffers that are being blamed. 4546 4547 ‘C-c M-g q’ (‘magit-blame-quit’) 4548 ‘C-c M-g B q’ 4549 This command turns off Magit-Blame mode. If the buffer was created 4550 during a recursive blame, then it also kills the buffer. 4551 4552 ‘<RET>’ (‘magit-show-commit’) 4553 This command shows the commit that last touched the line at point. 4554 4555 ‘<SPC>’ (‘magit-diff-show-or-scroll-up’) 4556 This command updates the commit buffer. 4557 4558 This either shows the commit that last touched the line at point in 4559 the appropriate buffer, or if that buffer is already being 4560 displayed in the current frame and if that buffer contains 4561 information about that commit, then the buffer is scrolled up 4562 instead. 4563 4564 ‘<DEL>’ (‘magit-diff-show-or-scroll-down’) 4565 This command updates the commit buffer. 4566 4567 This either shows the commit that last touched the line at point in 4568 the appropriate buffer, or if that buffer is already being 4569 displayed in the current frame and if that buffer contains 4570 information about that commit, then the buffer is scrolled down 4571 instead. 4572 4573 The following key bindings are available when both Magit-Blame mode 4574 and Read-Only mode are enabled. 4575 4576 ‘b’ (‘magit-blame’) 4577 See above. 4578 4579 ‘n’ (‘magit-blame-next-chunk’) 4580 This command moves to the next chunk. 4581 4582 ‘N’ (‘magit-blame-next-chunk-same-commit’) 4583 This command moves to the next chunk from the same commit. 4584 4585 ‘p’ (‘magit-blame-previous-chunk’) 4586 This command moves to the previous chunk. 4587 4588 ‘P’ (‘magit-blame-previous-chunk-same-commit’) 4589 This command moves to the previous chunk from the same commit. 4590 4591 ‘q’ (‘magit-blame-quit’) 4592 This command turns off Magit-Blame mode. If the buffer was created 4593 during a recursive blame, then it also kills the buffer. 4594 4595 ‘M-w’ (‘magit-blame-copy-hash’) 4596 This command saves the hash of the current chunk’s commit to the 4597 kill ring. 4598 4599 When the region is active, the command saves the region’s content 4600 instead of the hash, like ‘kill-ring-save’ would. 4601 4602 ‘c’ (‘magit-blame-cycle-style’) 4603 This command changes how blame information is visualized in the 4604 current buffer by cycling through the styles specified using the 4605 option ‘magit-blame-styles’. 4606 4607 Blaming is also controlled using the following options. 4608 4609 -- User Option: magit-blame-styles 4610 This option defines a list of styles used to visualize blame 4611 information. For now see its doc-string to learn more. 4612 4613 -- User Option: magit-blame-echo-style 4614 This option specifies the blame visualization style used by the 4615 command ‘magit-blame-echo’. This must be a symbol that is used as 4616 the identifier for one of the styles defined in 4617 ‘magit-blame-styles’. 4618 4619 -- User Option: magit-blame-time-format 4620 This option specifies the format string used to display times when 4621 showing blame information. 4622 4623 -- User Option: magit-blame-read-only 4624 This option controls whether blaming a buffer also makes 4625 temporarily read-only. 4626 4627 -- User Option: magit-blame-disable-modes 4628 This option lists incompatible minor-modes that should be disabled 4629 temporarily when a buffer contains blame information. They are 4630 enabled again when the buffer no longer shows blame information. 4631 4632 -- User Option: magit-blame-goto-chunk-hook 4633 This hook is run when moving between chunks. 4634 4635 4636 File: magit.info, Node: Manipulating, Next: Transferring, Prev: Inspecting, Up: Top 4637 4638 6 Manipulating 4639 ************** 4640 4641 * Menu: 4642 4643 * Creating Repository:: 4644 * Cloning Repository:: 4645 * Staging and Unstaging:: 4646 * Applying:: 4647 * Committing:: 4648 * Branching:: 4649 * Merging:: 4650 * Resolving Conflicts:: 4651 * Rebasing:: 4652 * Cherry Picking:: 4653 * Resetting:: 4654 * Stashing:: 4655 4656 4657 File: magit.info, Node: Creating Repository, Next: Cloning Repository, Up: Manipulating 4658 4659 6.1 Creating Repository 4660 ======================= 4661 4662 ‘I’ (‘magit-init’) 4663 This command initializes a repository and then shows the status 4664 buffer for the new repository. 4665 4666 If the directory is below an existing repository, then the user has 4667 to confirm that a new one should be created inside. If the 4668 directory is the root of the existing repository, then the user has 4669 to confirm that it should be reinitialized. 4670 4671 4672 File: magit.info, Node: Cloning Repository, Next: Staging and Unstaging, Prev: Creating Repository, Up: Manipulating 4673 4674 6.2 Cloning Repository 4675 ====================== 4676 4677 To clone a remote or local repository use ‘C’, which is bound to the 4678 command ‘magit-clone’. This command either act as a transient prefix 4679 command, which binds several infix arguments and suffix commands, or it 4680 can invoke ‘git clone’ directly, depending on whether a prefix argument 4681 is used and on the value of ‘magit-clone-always-transient’. 4682 4683 -- User Option: magit-clone-always-transient 4684 This option controls whether the command ‘magit-clone’ always acts 4685 as a transient prefix command, regardless of whether a prefix 4686 argument is used or not. If ‘t’, then that command always acts as 4687 a transient prefix. If ‘nil’, then a prefix argument has to be 4688 used for it to act as a transient. 4689 4690 ‘C’ (‘magit-clone’) 4691 This command either acts as a transient prefix command as described 4692 above or does the same thing as ‘transient-clone-regular’ as 4693 described below. 4694 4695 If it acts as a transient prefix, then it binds the following 4696 suffix commands and several infix arguments. 4697 4698 ‘C C’ (‘magit-clone-regular’) 4699 This command creates a regular clone of an existing repository. 4700 The repository and the target directory are read from the user. 4701 4702 ‘C s’ (‘magit-clone-shallow’) 4703 This command creates a shallow clone of an existing repository. 4704 The repository and the target directory are read from the user. By 4705 default the depth of the cloned history is a single commit, but 4706 with a prefix argument the depth is read from the user. 4707 4708 ‘C >’ (‘magit-clone-sparse’) 4709 This command creates a clone of an existing repository and 4710 initializes a sparse checkout, avoiding a checkout of the full 4711 working tree. To add more directories, use the 4712 ‘magit-sparse-checkout’ transient (see *note Sparse checkouts::). 4713 4714 ‘C b’ (‘magit-clone-bare’) 4715 This command creates a bare clone of an existing repository. The 4716 repository and the target directory are read from the user. 4717 4718 ‘C m’ (‘magit-clone-mirror’) 4719 This command creates a mirror of an existing repository. The 4720 repository and the target directory are read from the user. 4721 4722 The following suffixes are disabled by default. See *note 4723 (transient)Enabling and Disabling Suffixes:: for how to enable them. 4724 4725 ‘C d’ (‘magit-clone-shallow-since’) 4726 This command creates a shallow clone of an existing repository. 4727 Only commits that were committed after a date are cloned, which is 4728 read from the user. The repository and the target directory are 4729 also read from the user. 4730 4731 ‘C e’ (‘magit-clone-shallow-exclude’) 4732 This command creates a shallow clone of an existing repository. 4733 This reads a branch or tag from the user. Commits that are 4734 reachable from that are not cloned. The repository and the target 4735 directory are also read from the user. 4736 4737 -- User Option: magit-clone-set-remote-head 4738 This option controls whether cloning causes the reference 4739 ‘refs/remotes/<remote>/HEAD’ to be created in the clone. The 4740 default is to delete the reference after running ‘git clone’, which 4741 insists on creating it. This is because the reference has not been 4742 found to be particularly useful as it is not automatically updated 4743 when the ‘HEAD’ of the remote changes. Setting this option to ‘t’ 4744 preserves Git’s default behavior of creating the reference. 4745 4746 -- User Option: magit-clone-set-remote.pushDefault 4747 This option controls whether the value of the Git variable 4748 ‘remote.pushDefault’ is set after cloning. 4749 4750 • If ‘t’, then it is always set without asking. 4751 • If ‘ask’, then the users are asked every time they clone a 4752 repository. 4753 • If ‘nil’, then it is never set. 4754 4755 -- User Option: magit-clone-default-directory 4756 This option control the default directory name used when reading 4757 the destination for a cloning operation. 4758 4759 • If ‘nil’ (the default), then the value of ‘default-directory’ 4760 is used. 4761 • If a directory, then that is used. 4762 • If a function, then that is called with the remote url as the 4763 only argument and the returned value is used. 4764 4765 -- User Option: magit-clone-name-alist 4766 This option maps regular expressions, which match repository names, 4767 to repository urls, making it possible for users to enter short 4768 names instead of urls when cloning repositories. 4769 4770 Each element has the form ‘(REGEXP HOSTNAME USER)’. When the user 4771 enters a name when a cloning command asks for a name or url, then 4772 that is looked up in this list. The first element whose REGEXP 4773 matches is used. 4774 4775 The format specified by option ‘magit-clone-url-format’ is used to 4776 turn the name into an url, using HOSTNAME and the repository name. 4777 If the provided name contains a slash, then that is used. 4778 Otherwise if the name omits the owner of the repository, then the 4779 default user specified in the matched entry is used. 4780 4781 If USER contains a dot, then it is treated as a Git variable and 4782 the value of that is used as the username. Otherwise it is used as 4783 the username itself. 4784 4785 -- User Option: magit-clone-url-format 4786 The format specified by this option is used when turning repository 4787 names into urls. ‘%h’ is the hostname and ‘%n’ is the repository 4788 name, including the name of the owner. The value can be a string 4789 (representing a single static format) or an alist with elements 4790 ‘(HOSTNAME . FORMAT)’ mapping hostnames to formats. When an alist 4791 is used, the ‘t’ key represents the default format. 4792 4793 Example of a single format string: 4794 4795 (setq magit-clone-url-format 4796 "git@%h:%n.git") 4797 4798 Example of by-hostname format strings: 4799 4800 (setq magit-clone-url-format 4801 '(("git.example.com" . "git@%h:~%n") 4802 (nil . "git@%h:%n.git"))) 4803 4804 -- User Option: magit-post-clone-hook 4805 Hook run after the Git process has successfully finished cloning 4806 the repository. When the hook is called, ‘default-directory’ is 4807 let-bound to the directory where the repository has been cloned. 4808 4809 4810 File: magit.info, Node: Staging and Unstaging, Next: Applying, Prev: Cloning Repository, Up: Manipulating 4811 4812 6.3 Staging and Unstaging 4813 ========================= 4814 4815 Like Git, Magit can of course stage and unstage complete files. Unlike 4816 Git, it also allows users to gracefully un-/stage individual hunks and 4817 even just part of a hunk. To stage individual hunks and parts of hunks 4818 using Git directly, one has to use the very modal and rather clumsy 4819 interface of a ‘git add --interactive’ session. 4820 4821 With Magit, on the other hand, one can un-/stage individual hunks by 4822 just moving point into the respective section inside a diff displayed in 4823 the status buffer or a separate diff buffer and typing ‘s’ or ‘u’. To 4824 operate on just parts of a hunk, mark the changes that should be 4825 un-/staged using the region and then press the same key that would be 4826 used to un-/stage. To stage multiple files or hunks at once use a 4827 region that starts inside the heading of such a section and ends inside 4828 the heading of a sibling section of the same type. 4829 4830 Besides staging and unstaging, Magit also provides several other 4831 "apply variants" that can also operate on a file, multiple files at 4832 once, a hunk, multiple hunks at once, and on parts of a hunk. These 4833 apply variants are described in the next section. 4834 4835 You can also use Ediff to stage and unstage. See *note Ediffing::. 4836 4837 ‘s’ (‘magit-stage’) 4838 Add the change at point to the staging area. 4839 4840 With a prefix argument and an untracked file (or files) at point, 4841 stage the file but not its content. This makes it possible to 4842 stage only a subset of the new file’s changes. 4843 4844 ‘S’ (‘magit-stage-modified’) 4845 Stage all changes to files modified in the worktree. Stage all new 4846 content of tracked files and remove tracked files that no longer 4847 exist in the working tree from the index also. With a prefix 4848 argument also stage previously untracked (but not ignored) files. 4849 4850 ‘u’ (‘magit-unstage’) 4851 Remove the change at point from the staging area. 4852 4853 Only staged changes can be unstaged. But by default this command 4854 performs an action that is somewhat similar to unstaging, when it 4855 is called on a committed change: it reverses the change in the 4856 index but not in the working tree. 4857 4858 ‘U’ (‘magit-unstage-all’) 4859 Remove all changes from the staging area. 4860 4861 -- User Option: magit-unstage-committed 4862 This option controls whether ‘magit-unstage’ "unstages" committed 4863 changes by reversing them in the index but not the working tree. 4864 The alternative is to raise an error. 4865 4866 ‘M-x magit-reverse-in-index’ 4867 This command reverses the committed change at point in the index 4868 but not the working tree. By default no key is bound directly to 4869 this command, but it is indirectly called when ‘u’ 4870 (‘magit-unstage’) is pressed on a committed change. 4871 4872 This allows extracting a change from ‘HEAD’, while leaving it in 4873 the working tree, so that it can later be committed using a 4874 separate commit. A typical workflow would be: 4875 4876 1. Optionally make sure that there are no uncommitted changes. 4877 2. Visit the ‘HEAD’ commit and navigate to the change that should 4878 not have been included in that commit. 4879 3. Type ‘u’ (‘magit-unstage’) to reverse it in the index. This 4880 assumes that ‘magit-unstage-committed’ is non-nil. 4881 4. Type ‘c e’ to extend ‘HEAD’ with the staged changes, including 4882 those that were already staged before. 4883 5. Optionally stage the remaining changes using ‘s’ or ‘S’ and 4884 then type ‘c c’ to create a new commit. 4885 4886 ‘M-x magit-reset-index’ 4887 Reset the index to some commit. The commit is read from the user 4888 and defaults to the commit at point. If there is no commit at 4889 point, then it defaults to ‘HEAD’. 4890 4891 * Menu: 4892 4893 * Staging from File-Visiting Buffers:: 4894 4895 4896 File: magit.info, Node: Staging from File-Visiting Buffers, Up: Staging and Unstaging 4897 4898 6.3.1 Staging from File-Visiting Buffers 4899 ---------------------------------------- 4900 4901 Fine-grained un-/staging has to be done from the status or a diff 4902 buffer, but it’s also possible to un-/stage all changes made to the file 4903 visited in the current buffer right from inside that buffer. 4904 4905 ‘M-x magit-stage-file’ 4906 When invoked inside a file-visiting buffer, then stage all changes 4907 to that file. In a Magit buffer, stage the file at point if any. 4908 Otherwise prompt for a file to be staged. With a prefix argument 4909 always prompt the user for a file, even in a file-visiting buffer 4910 or when there is a file section at point. 4911 4912 ‘M-x magit-unstage-file’ 4913 When invoked inside a file-visiting buffer, then unstage all 4914 changes to that file. In a Magit buffer, unstage the file at point 4915 if any. Otherwise prompt for a file to be unstaged. With a prefix 4916 argument always prompt the user for a file, even in a file-visiting 4917 buffer or when there is a file section at point. 4918 4919 4920 File: magit.info, Node: Applying, Next: Committing, Prev: Staging and Unstaging, Up: Manipulating 4921 4922 6.4 Applying 4923 ============ 4924 4925 Magit provides several "apply variants": stage, unstage, discard, 4926 reverse, and "regular apply". At least when operating on a hunk they 4927 are all implemented using ‘git apply’, which is why they are called 4928 "apply variants". 4929 4930 • Stage. Apply a change from the working tree to the index. The 4931 change also remains in the working tree. 4932 4933 • Unstage. Remove a change from the index. The change remains in 4934 the working tree. 4935 4936 • Discard. On a staged change, remove it from the working tree and 4937 the index. On an unstaged change, remove it from the working tree 4938 only. 4939 4940 • Reverse. Reverse a change in the working tree. Both committed and 4941 staged changes can be reversed. Unstaged changes cannot be 4942 reversed. Discard them instead. 4943 4944 • Apply. Apply a change to the working tree. Both committed and 4945 staged changes can be applied. Unstaged changes cannot be applied 4946 - as they already have been applied. 4947 4948 The previous section described the staging and unstaging commands. 4949 What follows are the commands which implement the remaining apply 4950 variants. 4951 4952 ‘a’ (‘magit-apply’) 4953 Apply the change at point to the working tree. 4954 4955 With a prefix argument fallback to a 3-way merge. Doing so causes 4956 the change to be applied to the index as well. 4957 4958 ‘k’ (‘magit-discard’) 4959 Remove the change at point from the working tree. 4960 4961 On a hunk or file with unresolved conflicts prompt which side to 4962 keep (while discarding the other). If point is within the text of 4963 a side, then keep that side without prompting. 4964 4965 ‘v’ (‘magit-reverse’) 4966 Reverse the change at point in the working tree. 4967 4968 With a prefix argument fallback to a 3-way merge. Doing so causes 4969 the change to be applied to the index as well. 4970 4971 With a prefix argument all apply variants attempt a 3-way merge when 4972 appropriate (i.e., when ‘git apply’ is used internally). 4973 4974 4975 File: magit.info, Node: Committing, Next: Branching, Prev: Applying, Up: Manipulating 4976 4977 6.5 Committing 4978 ============== 4979 4980 When the user initiates a commit, Magit calls ‘git commit’ without any 4981 arguments, so Git has to get it from the user. It creates the file 4982 ‘.git/COMMIT_EDITMSG’ and then opens that file in an editor. Magit 4983 arranges for that editor to be the Emacsclient. Once the user finishes 4984 the editing session, the Emacsclient exits and Git creates the commit 4985 using the file’s content as message. 4986 4987 * Menu: 4988 4989 * Initiating a Commit:: 4990 * Editing Commit Messages:: 4991 4992 4993 File: magit.info, Node: Initiating a Commit, Next: Editing Commit Messages, Up: Committing 4994 4995 6.5.1 Initiating a Commit 4996 ------------------------- 4997 4998 Also see *note (gitman)git-commit::. 4999 5000 ‘c’ (‘magit-commit’) 5001 This transient prefix command binds the following suffix commands 5002 along with the appropriate infix arguments and displays them in a 5003 temporary buffer until a suffix is invoked. 5004 5005 ‘c c’ (‘magit-commit-create’) 5006 Create a new commit on ‘HEAD’. With a prefix argument amend to the 5007 commit at ‘HEAD’ instead. 5008 5009 ‘c a’ (‘magit-commit-amend’) 5010 Amend the last commit. 5011 5012 ‘c e’ (‘magit-commit-extend’) 5013 Amend the last commit, without editing the message. With a prefix 5014 argument keep the committer date, otherwise change it. The option 5015 ‘magit-commit-extend-override-date’ can be used to inverse the 5016 meaning of the prefix argument. 5017 5018 Non-interactively respect the optional OVERRIDE-DATE argument and 5019 ignore the option. 5020 5021 ‘c w’ (‘magit-commit-reword’) 5022 Reword the last commit, ignoring staged changes. With a prefix 5023 argument keep the committer date, otherwise change it. The option 5024 ‘magit-commit-reword-override-date’ can be used to inverse the 5025 meaning of the prefix argument. 5026 5027 Non-interactively respect the optional OVERRIDE-DATE argument and 5028 ignore the option. 5029 5030 ‘c f’ (‘magit-commit-fixup’) 5031 Create a fixup commit. 5032 5033 With a prefix argument the target commit has to be confirmed. 5034 Otherwise the commit at point may be used without confirmation 5035 depending on the value of option ‘magit-commit-squash-confirm’. 5036 5037 ‘c F’ (‘magit-commit-instant-fixup’) 5038 Create a fixup commit and instantly rebase. 5039 5040 ‘c s’ (‘magit-commit-squash’) 5041 Create a squash commit, without editing the squash message. 5042 5043 With a prefix argument the target commit has to be confirmed. 5044 Otherwise the commit at point may be used without confirmation 5045 depending on the value of option ‘magit-commit-squash-confirm’. 5046 5047 ‘c S’ (‘magit-commit-instant-squash’) 5048 Create a squash commit and instantly rebase. 5049 5050 ‘c A’ (‘magit-commit-augment’) 5051 Create a squash commit, editing the squash message. 5052 5053 With a prefix argument the target commit has to be confirmed. 5054 Otherwise the commit at point may be used without confirmation 5055 depending on the value of option ‘magit-commit-squash-confirm’. 5056 5057 -- User Option: magit-commit-ask-to-stage 5058 Whether to ask to stage all unstaged changes when committing and 5059 nothing is staged. 5060 5061 -- User Option: magit-commit-show-diff 5062 Whether the relevant diff is automatically shown when committing. 5063 5064 -- User Option: magit-commit-extend-override-date 5065 Whether using ‘magit-commit-extend’ changes the committer date. 5066 5067 -- User Option: magit-commit-reword-override-date 5068 Whether using ‘magit-commit-reword’ changes the committer date. 5069 5070 -- User Option: magit-commit-squash-confirm 5071 Whether the commit targeted by squash and fixup has to be 5072 confirmed. When non-nil then the commit at point (if any) is used 5073 as default choice. Otherwise it has to be confirmed. This option 5074 only affects ‘magit-commit-squash’ and ‘magit-commit-fixup’. The 5075 "instant" variants always require confirmation because making an 5076 error while using those is harder to recover from. 5077 5078 -- User Option: magit-post-commit-hook 5079 Hook run after creating a commit without the user editing a 5080 message. 5081 5082 This hook is run by ‘magit-refresh’ if ‘this-command’ is a member 5083 of ‘magit-post-commit-hook-commands’. This only includes commands 5084 named ‘magit-commit-*’ that do *not* require that the user edits 5085 the commit message in a buffer. 5086 5087 Also see ‘git-commit-post-finish-hook’. 5088 5089 -- User Option: magit-commit-diff-inhibit-same-window 5090 Whether to inhibit use of same window when showing diff while 5091 committing. 5092 5093 When writing a commit, then a diff of the changes to be committed 5094 is automatically shown. The idea is that the diff is shown in a 5095 different window of the same frame and for most users that just 5096 works. In other words most users can completely ignore this option 5097 because its value doesn’t make a difference for them. 5098 5099 However for users who configured Emacs to never create a new window 5100 even when the package explicitly tries to do so, then displaying 5101 two new buffers necessarily means that the first is immediately 5102 replaced by the second. In our case the message buffer is 5103 immediately replaced by the diff buffer, which is of course highly 5104 undesirable. 5105 5106 A workaround is to suppress this user configuration in this 5107 particular case. Users have to explicitly opt-in by toggling this 5108 option. We cannot enable the workaround unconditionally because 5109 that again causes issues for other users: if the frame is too tiny 5110 or the relevant settings too aggressive, then the diff buffer would 5111 end up being displayed in a new frame. 5112 5113 Also see <https://github.com/magit/magit/issues/4132>. 5114 5115 5116 File: magit.info, Node: Editing Commit Messages, Prev: Initiating a Commit, Up: Committing 5117 5118 6.5.2 Editing Commit Messages 5119 ----------------------------- 5120 5121 After initiating a commit as described in the previous section, two new 5122 buffers appear. One shows the changes that are about to be committed, 5123 while the other is used to write the message. 5124 5125 Commit messages are edited in an edit session - in the background 5126 ‘git’ is waiting for the editor, in our case ‘emacsclient’, to save the 5127 commit message in a file (in most cases ‘.git/COMMIT_EDITMSG’) and then 5128 return. If the editor returns with a non-zero exit status then ‘git’ 5129 does not create the commit. So the most important commands are those 5130 for finishing and aborting the commit. 5131 5132 ‘C-c C-c’ (‘with-editor-finish’) 5133 Finish the current editing session by returning with exit code 0. 5134 Git then creates the commit using the message it finds in the file. 5135 5136 ‘C-c C-k’ (‘with-editor-cancel’) 5137 Cancel the current editing session by returning with exit code 1. 5138 Git then cancels the commit, but leaves the file untouched. 5139 5140 In addition to being used by ‘git commit’, messages may also be 5141 stored in a ring that persists until Emacs is closed. By default the 5142 message is stored at the beginning and the end of an edit session 5143 (regardless of whether the session is finished successfully or was 5144 canceled). It is sometimes useful to bring back messages from that 5145 ring. 5146 5147 ‘C-c M-s’ (‘git-commit-save-message’) 5148 Save the current buffer content to the commit message ring. 5149 5150 ‘M-p’ (‘git-commit-prev-message’) 5151 Cycle backward through the commit message ring, after saving the 5152 current message to the ring. With a numeric prefix ARG, go back 5153 ARG comments. 5154 5155 ‘M-n’ (‘git-commit-next-message’) 5156 Cycle forward through the commit message ring, after saving the 5157 current message to the ring. With a numeric prefix ARG, go back 5158 ARG comments. 5159 5160 By default the diff for the changes that are about to be committed 5161 are automatically shown when invoking the commit. To prevent that, 5162 remove ‘magit-commit-diff’ from ‘server-switch-hook’. 5163 5164 When amending to an existing commit it may be useful to show either 5165 the changes that are about to be added to that commit or to show those 5166 changes alongside those that have already been committed. 5167 5168 ‘C-c C-d’ (‘magit-diff-while-committing’) 5169 While committing, show the changes that are about to be committed. 5170 While amending, invoking the command again toggles between showing 5171 just the new changes or all the changes that will be committed. 5172 5173 * Menu: 5174 5175 * Using the Revision Stack:: 5176 * Commit Pseudo Headers:: 5177 * Commit Mode and Hooks:: 5178 * Commit Message Conventions:: 5179 5180 5181 File: magit.info, Node: Using the Revision Stack, Next: Commit Pseudo Headers, Up: Editing Commit Messages 5182 5183 Using the Revision Stack 5184 ........................ 5185 5186 ‘C-c C-w’ (‘magit-pop-revision-stack’) 5187 This command inserts a representation of a revision into the 5188 current buffer. It can be used inside buffers used to write commit 5189 messages but also in other buffers such as buffers used to edit 5190 emails or ChangeLog files. 5191 5192 By default this command pops the revision which was last added to 5193 the ‘magit-revision-stack’ and inserts it into the current buffer 5194 according to ‘magit-pop-revision-stack-format’. Revisions can be 5195 put on the stack using ‘magit-copy-section-value’ and 5196 ‘magit-copy-buffer-revision’. 5197 5198 If the stack is empty or with a prefix argument it instead reads a 5199 revision in the minibuffer. By using the minibuffer history this 5200 allows selecting an item which was popped earlier or to insert an 5201 arbitrary reference or revision without first pushing it onto the 5202 stack. 5203 5204 When reading the revision from the minibuffer, then it might not be 5205 possible to guess the correct repository. When this command is 5206 called inside a repository (e.g., while composing a commit 5207 message), then that repository is used. Otherwise (e.g., while 5208 composing an email) then the repository recorded for the top 5209 element of the stack is used (even though we insert another 5210 revision). If not called inside a repository and with an empty 5211 stack, or with two prefix arguments, then read the repository in 5212 the minibuffer too. 5213 5214 -- User Option: magit-pop-revision-stack-format 5215 This option controls how the command ‘magit-pop-revision-stack’ 5216 inserts a revision into the current buffer. 5217 5218 The entries on the stack have the format ‘(HASH TOPLEVEL)’ and this 5219 option has the format ‘(POINT-FORMAT EOB-FORMAT INDEX-REGEXP)’, all 5220 of which may be nil or a string (though either one of EOB-FORMAT or 5221 POINT-FORMAT should be a string, and if INDEX-REGEXP is non-nil, 5222 then the two formats should be too). 5223 5224 First INDEX-REGEXP is used to find the previously inserted entry, 5225 by searching backward from point. The first submatch must match 5226 the index number. That number is incremented by one, and becomes 5227 the index number of the entry to be inserted. If you don’t want to 5228 number the inserted revisions, then use nil for INDEX-REGEXP. 5229 5230 If INDEX-REGEXP is non-nil then both POINT-FORMAT and EOB-FORMAT 5231 should contain \"%N\", which is replaced with the number that was 5232 determined in the previous step. 5233 5234 Both formats, if non-nil and after removing %N, are then expanded 5235 using ‘git show --format=FORMAT ...’ inside TOPLEVEL. 5236 5237 The expansion of POINT-FORMAT is inserted at point, and the 5238 expansion of EOB-FORMAT is inserted at the end of the buffer (if 5239 the buffer ends with a comment, then it is inserted right before 5240 that). 5241 5242 5243 File: magit.info, Node: Commit Pseudo Headers, Next: Commit Mode and Hooks, Prev: Using the Revision Stack, Up: Editing Commit Messages 5244 5245 Commit Pseudo Headers 5246 ..................... 5247 5248 Some projects use pseudo headers in commit messages. Magit colorizes 5249 such headers and provides some commands to insert such headers. 5250 5251 -- User Option: git-commit-known-pseudo-headers 5252 A list of Git pseudo headers to be highlighted. 5253 5254 ‘C-c C-i’ (‘git-commit-insert-pseudo-header’) 5255 Insert a commit message pseudo header. 5256 5257 ‘C-c C-a’ (‘git-commit-ack’) 5258 Insert a header acknowledging that you have looked at the commit. 5259 5260 ‘C-c C-r’ (‘git-commit-review’) 5261 Insert a header acknowledging that you have reviewed the commit. 5262 5263 ‘C-c C-s’ (‘git-commit-signoff’) 5264 Insert a header to sign off the commit. 5265 5266 ‘C-c C-t’ (‘git-commit-test’) 5267 Insert a header acknowledging that you have tested the commit. 5268 5269 ‘C-c C-o’ (‘git-commit-cc’) 5270 Insert a header mentioning someone who might be interested. 5271 5272 ‘C-c C-p’ (‘git-commit-reported’) 5273 Insert a header mentioning the person who reported the issue being 5274 fixed by the commit. 5275 5276 ‘C-c M-i’ (‘git-commit-suggested’) 5277 Insert a header mentioning the person who suggested the change. 5278 5279 5280 File: magit.info, Node: Commit Mode and Hooks, Next: Commit Message Conventions, Prev: Commit Pseudo Headers, Up: Editing Commit Messages 5281 5282 Commit Mode and Hooks 5283 ..................... 5284 5285 ‘git-commit-mode’ is a minor mode that is only used to establish certain 5286 key bindings. This makes it possible to use an arbitrary major mode in 5287 buffers used to edit commit messages. It is even possible to use 5288 different major modes in different repositories, which is useful when 5289 different projects impose different commit message conventions. 5290 5291 -- User Option: git-commit-major-mode 5292 The value of this option is the major mode used to edit Git commit 5293 messages. 5294 5295 Because ‘git-commit-mode’ is a minor mode, we don’t use its mode hook 5296 to setup the buffer, except for the key bindings. All other setup 5297 happens in the function ‘git-commit-setup’, which among other things 5298 runs the hook ‘git-commit-setup-hook’. 5299 5300 -- User Option: git-commit-setup-hook 5301 Hook run at the end of ‘git-commit-setup’. 5302 5303 The following functions are suitable for this hook: 5304 5305 -- Function: git-commit-save-message 5306 Save the current buffer content to the commit message ring. 5307 5308 -- Function: git-commit-setup-changelog-support 5309 After this function is called, ChangeLog entries are treated as 5310 paragraphs. 5311 5312 -- Function: git-commit-turn-on-auto-fill 5313 Turn on ‘auto-fill-mode’. 5314 5315 -- Function: git-commit-turn-on-flyspell 5316 Turn on Flyspell mode. Also prevent comments from being checked 5317 and finally check current non-comment text. 5318 5319 -- Function: git-commit-propertize-diff 5320 Propertize the diff shown inside the commit message buffer. Git 5321 inserts such diffs into the commit message template when the 5322 ‘--verbose’ argument is used. ‘magit-commit’ by default does not 5323 offer that argument because the diff that is shown in a separate 5324 buffer is more useful. But some users disagree, which is why this 5325 function exists. 5326 5327 -- Function: bug-reference-mode 5328 Hyperlink bug references in the buffer. 5329 5330 -- Function: with-editor-usage-message 5331 Show usage information in the echo area. 5332 5333 -- User Option: git-commit-post-finish-hook 5334 Hook run after the user finished writing a commit message. 5335 5336 This hook is only run after pressing ‘C-c C-c’ in a buffer used to 5337 edit a commit message. If a commit is created without the user 5338 typing a message into a buffer, then this hook is not run. 5339 5340 This hook is not run until the new commit has been created. If 5341 doing so takes Git longer than one second, then this hook isn’t run 5342 at all. For certain commands such as ‘magit-rebase-continue’ this 5343 hook is never run because doing so would lead to a race condition. 5344 5345 This hook is only run if ‘magit’ is available. 5346 5347 Also see ‘magit-post-commit-hook’. 5348 5349 5350 File: magit.info, Node: Commit Message Conventions, Prev: Commit Mode and Hooks, Up: Editing Commit Messages 5351 5352 Commit Message Conventions 5353 .......................... 5354 5355 Git-Commit highlights certain violations of commonly accepted commit 5356 message conventions. Certain violations even cause Git-Commit to ask 5357 you to confirm that you really want to do that. This nagging can of 5358 course be turned off, but the result of doing that usually is that 5359 instead of some code it’s now the human who is reviewing your commits 5360 who has to waste some time telling you to fix your commits. 5361 5362 -- User Option: git-commit-summary-max-length 5363 The intended maximal length of the summary line of commit messages. 5364 Characters beyond this column are colorized to indicate that this 5365 preference has been violated. 5366 5367 -- User Option: git-commit-finish-query-functions 5368 List of functions called to query before performing commit. 5369 5370 The commit message buffer is current while the functions are 5371 called. If any of them returns nil, then the commit is not 5372 performed and the buffer is not killed. The user should then fix 5373 the issue and try again. 5374 5375 The functions are called with one argument. If it is non-nil then 5376 that indicates that the user used a prefix argument to force 5377 finishing the session despite issues. Functions should usually 5378 honor this wish and return non-nil. 5379 5380 By default the only member is ‘git-commit-check-style-conventions’. 5381 5382 -- Function: git-commit-check-style-conventions 5383 This function checks for violations of certain basic style 5384 conventions. For each violation it asks users if they want to 5385 proceed anyway. 5386 5387 -- User Option: git-commit-style-convention-checks 5388 This option controls what conventions the function by the same name 5389 tries to enforce. The value is a list of self-explanatory symbols 5390 identifying certain conventions; ‘non-empty-second-line’ and 5391 ‘overlong-summary-line’. 5392 5393 5394 File: magit.info, Node: Branching, Next: Merging, Prev: Committing, Up: Manipulating 5395 5396 6.6 Branching 5397 ============= 5398 5399 * Menu: 5400 5401 * The Two Remotes:: 5402 * Branch Commands:: 5403 * Branch Git Variables:: 5404 * Auxiliary Branch Commands:: 5405 5406 5407 File: magit.info, Node: The Two Remotes, Next: Branch Commands, Up: Branching 5408 5409 6.6.1 The Two Remotes 5410 --------------------- 5411 5412 The upstream branch of some local branch is the branch into which the 5413 commits on that local branch should eventually be merged, usually 5414 something like ‘origin/master’. For the ‘master’ branch itself the 5415 upstream branch and the branch it is being pushed to, are usually the 5416 same remote branch. But for a feature branch the upstream branch and 5417 the branch it is being pushed to should differ. 5418 5419 The commits on feature branches too should _eventually_ end up in a 5420 remote branch such as ‘origin/master’ or ‘origin/maint’. Such a branch 5421 should therefore be used as the upstream. But feature branches 5422 shouldn’t be pushed directly to such branches. Instead a feature branch 5423 ‘my-feature’ is usually pushed to ‘my-fork/my-feature’ or if you are a 5424 contributor ‘origin/my-feature’. After the new feature has been 5425 reviewed, the maintainer merges the feature into ‘master’. And finally 5426 ‘master’ (not ‘my-feature’ itself) is pushed to ‘origin/master’. 5427 5428 But new features seldom are perfect on the first try, and so feature 5429 branches usually have to be reviewed, improved, and re-pushed several 5430 times. Pushing should therefore be easy to do, and for that reason many 5431 Git users have concluded that it is best to use the remote branch to 5432 which the local feature branch is being pushed as its upstream. 5433 5434 But luckily Git has long ago gained support for a push-remote which 5435 can be configured separately from the upstream branch, using the 5436 variables ‘branch.<name>.pushRemote’ and ‘remote.pushDefault’. So we no 5437 longer have to choose which of the two remotes should be used as "the 5438 remote". 5439 5440 Each of the fetching, pulling, and pushing transient commands 5441 features three suffix commands that act on the current branch and some 5442 other branch. Of these, ‘p’ is bound to a command which acts on the 5443 push-remote, ‘u’ is bound to a command which acts on the upstream, and 5444 ‘e’ is bound to a command which acts on any other branch. The status 5445 buffer shows unpushed and unpulled commits for both the push-remote and 5446 the upstream. 5447 5448 It’s fairly simple to configure these two remotes. The values of all 5449 the variables that are related to fetching, pulling, and pushing (as 5450 well as some other branch-related variables) can be inspected and 5451 changed using the command ‘magit-branch-configure’, which is available 5452 from many transient prefix commands that deal with branches. It is also 5453 possible to set the push-remote or upstream while pushing (see *note 5454 Pushing::). 5455 5456 5457 File: magit.info, Node: Branch Commands, Next: Branch Git Variables, Prev: The Two Remotes, Up: Branching 5458 5459 6.6.2 Branch Commands 5460 --------------------- 5461 5462 The transient prefix command ‘magit-branch’ is used to create and 5463 checkout branches, and to make changes to existing branches. It is not 5464 used to fetch, pull, merge, rebase, or push branches, i.e., this command 5465 deals with branches themselves, not with the commits reachable from 5466 them. Those features are available from separate transient command. 5467 5468 ‘b’ (‘magit-branch’) 5469 This transient prefix command binds the following suffix commands 5470 and displays them in a temporary buffer until a suffix is invoked. 5471 5472 By default it also binds and displays the values of some 5473 branch-related Git variables and allows changing their values. 5474 5475 -- User Option: magit-branch-direct-configure 5476 This option controls whether the transient command ‘magit-branch’ 5477 can be used to directly change the values of Git variables. This 5478 defaults to ‘t’ (to avoid changing key bindings). When set to 5479 ‘nil’, then no variables are displayed by that transient command, 5480 and its suffix command ‘magit-branch-configure’ has to be used 5481 instead to view and change branch related variables. 5482 5483 ‘b C’ (‘magit-branch-configure’) 5484 ‘f C’ 5485 ‘F C’ 5486 ‘P C’ 5487 This transient prefix command binds commands that set the value of 5488 branch-related variables and displays them in a temporary buffer 5489 until the transient is exited. 5490 5491 With a prefix argument, this command always prompts for a branch. 5492 5493 Without a prefix argument this depends on whether it was invoked as 5494 a suffix of ‘magit-branch’ and on the 5495 ‘magit-branch-direct-configure’ option. If ‘magit-branch’ already 5496 displays the variables for the current branch, then it isn’t useful 5497 to invoke another transient that displays them for the same branch. 5498 In that case this command prompts for a branch. 5499 5500 The variables are described in *note Branch Git Variables::. 5501 5502 ‘b b’ (‘magit-checkout’) 5503 Checkout a revision read in the minibuffer and defaulting to the 5504 branch or arbitrary revision at point. If the revision is a local 5505 branch then that becomes the current branch. If it is something 5506 else then ‘HEAD’ becomes detached. Checkout fails if the working 5507 tree or the staging area contain changes. 5508 5509 ‘b n’ (‘magit-branch-create’) 5510 Create a new branch. The user is asked for a branch or arbitrary 5511 revision to use as the starting point of the new branch. When a 5512 branch name is provided, then that becomes the upstream branch of 5513 the new branch. The name of the new branch is also read in the 5514 minibuffer. 5515 5516 Also see option ‘magit-branch-prefer-remote-upstream’. 5517 5518 ‘b c’ (‘magit-branch-and-checkout’) 5519 This command creates a new branch like ‘magit-branch-create’, but 5520 then also checks it out. 5521 5522 Also see option ‘magit-branch-prefer-remote-upstream’. 5523 5524 ‘b l’ (‘magit-branch-checkout’) 5525 This command checks out an existing or new local branch. It reads 5526 a branch name from the user offering all local branches and a 5527 subset of remote branches as candidates. Remote branches for which 5528 a local branch by the same name exists are omitted from the list of 5529 candidates. The user can also enter a completely new branch name. 5530 5531 • If the user selects an existing local branch, then that is 5532 checked out. 5533 5534 • If the user selects a remote branch, then it creates and 5535 checks out a new local branch with the same name, and 5536 configures the selected remote branch as the push target. 5537 5538 • If the user enters a new branch name, then it creates and 5539 checks that out, after also reading the starting-point from 5540 the user. 5541 5542 In the latter two cases the upstream is also set. Whether it is 5543 set to the chosen starting point or something else depends on the 5544 value of ‘magit-branch-adjust-remote-upstream-alist’. 5545 5546 ‘b s’ (‘magit-branch-spinoff’) 5547 This command creates and checks out a new branch starting at and 5548 tracking the current branch. That branch in turn is reset to the 5549 last commit it shares with its upstream. If the current branch has 5550 no upstream or no unpushed commits, then the new branch is created 5551 anyway and the previously current branch is not touched. 5552 5553 This is useful to create a feature branch after work has already 5554 begun on the old branch (likely but not necessarily "master"). 5555 5556 If the current branch is a member of the value of option 5557 ‘magit-branch-prefer-remote-upstream’ (which see), then the current 5558 branch will be used as the starting point as usual, but the 5559 upstream of the starting-point may be used as the upstream of the 5560 new branch, instead of the starting-point itself. 5561 5562 If optional FROM is non-nil, then the source branch is reset to 5563 ‘FROM~’, instead of to the last commit it shares with its upstream. 5564 Interactively, FROM is only ever non-nil, if the region selects 5565 some commits, and among those commits, FROM is the commit that is 5566 the fewest commits ahead of the source branch. 5567 5568 The commit at the other end of the selection actually does not 5569 matter, all commits between FROM and ‘HEAD’ are moved to the new 5570 branch. If FROM is not reachable from ‘HEAD’ or is reachable from 5571 the source branch’s upstream, then an error is raised. 5572 5573 ‘b S’ (‘magit-branch-spinout’) 5574 This command behaves like ‘magit-branch-spinoff’, except that it 5575 does not change the current branch. If there are any uncommitted 5576 changes, then it behaves exactly like ‘magit-branch-spinoff’. 5577 5578 ‘b x’ (‘magit-branch-reset’) 5579 This command resets a branch, defaulting to the branch at point, to 5580 the tip of another branch or any other commit. 5581 5582 When the branch being reset is the current branch, then a hard 5583 reset is performed. If there are any uncommitted changes, then the 5584 user has to confirm the reset because those changes would be lost. 5585 5586 This is useful when you have started work on a feature branch but 5587 realize it’s all crap and want to start over. 5588 5589 When resetting to another branch and a prefix argument is used, 5590 then the target branch is set as the upstream of the branch that is 5591 being reset. 5592 5593 ‘b k’ (‘magit-branch-delete’) 5594 Delete one or multiple branches. If the region marks multiple 5595 branches, then offer to delete those. Otherwise, prompt for a 5596 single branch to be deleted, defaulting to the branch at point. 5597 5598 Require confirmation when deleting branches is dangerous in some 5599 way. Option ‘magit-no-confirm’ can be customized to not require 5600 confirmation in certain cases. See its docstring to learn why 5601 confirmation is required by default in certain cases or if a prompt 5602 is confusing. 5603 5604 ‘b m’ (‘magit-branch-rename’) 5605 Rename a branch. The branch and the new name are read in the 5606 minibuffer. With prefix argument the branch is renamed even if 5607 that name conflicts with an existing branch. 5608 5609 -- User Option: magit-branch-read-upstream-first 5610 When creating a branch, whether to read the upstream branch before 5611 the name of the branch that is to be created. The default is ‘t’, 5612 and I recommend you leave it at that. 5613 5614 -- User Option: magit-branch-prefer-remote-upstream 5615 This option specifies whether remote upstreams are favored over 5616 local upstreams when creating new branches. 5617 5618 When a new branch is created, then the branch, commit, or stash at 5619 point is suggested as the starting point of the new branch, or if 5620 there is no such revision at point the current branch. In either 5621 case the user may choose another starting point. 5622 5623 If the chosen starting point is a branch, then it may also be set 5624 as the upstream of the new branch, depending on the value of the 5625 Git variable ‘branch.autoSetupMerge’. By default this is done for 5626 remote branches, but not for local branches. 5627 5628 You might prefer to always use some remote branch as upstream. If 5629 the chosen starting point is (1) a local branch, (2) whose name 5630 matches a member of the value of this option, (3) the upstream of 5631 that local branch is a remote branch with the same name, and (4) 5632 that remote branch can be fast-forwarded to the local branch, then 5633 the chosen branch is used as starting point, but its own upstream 5634 is used as the upstream of the new branch. 5635 5636 Members of this option’s value are treated as branch names that 5637 have to match exactly unless they contain a character that makes 5638 them invalid as a branch name. Recommended characters to use to 5639 trigger interpretation as a regexp are "*" and "^". Some other 5640 characters which you might expect to be invalid, actually are not, 5641 e.g., ".+$" are all perfectly valid. More precisely, if ‘git 5642 check-ref-format --branch STRING’ exits with a non-zero status, 5643 then treat STRING as a regexp. 5644 5645 Assuming the chosen branch matches these conditions you would end 5646 up with with e.g.: 5647 5648 feature --upstream--> origin/master 5649 5650 instead of 5651 5652 feature --upstream--> master --upstream--> origin/master 5653 5654 Which you prefer is a matter of personal preference. If you do 5655 prefer the former, then you should add branches such as ‘master’, 5656 ‘next’, and ‘maint’ to the value of this options. 5657 5658 -- User Option: magit-branch-adjust-remote-upstream-alist 5659 The value of this option is an alist of branches to be used as the 5660 upstream when branching a remote branch. 5661 5662 When creating a local branch from an ephemeral branch located on a 5663 remote, e.g., a feature or hotfix branch, then that remote branch 5664 should usually not be used as the upstream branch, since the 5665 push-remote already allows accessing it and having both the 5666 upstream and the push-remote reference the same related branch 5667 would be wasteful. Instead a branch like "maint" or "master" 5668 should be used as the upstream. 5669 5670 This option allows specifying the branch that should be used as the 5671 upstream when branching certain remote branches. The value is an 5672 alist of the form ‘((UPSTREAM . RULE)...)’. The first matching 5673 element is used, the following elements are ignored. 5674 5675 UPSTREAM is the branch to be used as the upstream for branches 5676 specified by RULE. It can be a local or a remote branch. 5677 5678 RULE can either be a regular expression, matching branches whose 5679 upstream should be the one specified by UPSTREAM. Or it can be a 5680 list of the only branches that should *not* use UPSTREAM; all other 5681 branches will. Matching is done after stripping the remote part of 5682 the name of the branch that is being branched from. 5683 5684 If you use a finite set of non-ephemeral branches across all your 5685 repositories, then you might use something like: 5686 5687 (("origin/master" . ("master" "next" "maint"))) 5688 5689 Or if the names of all your ephemeral branches contain a slash, at 5690 least in some repositories, then a good value could be: 5691 5692 (("origin/master" . "/")) 5693 5694 Of course you can also fine-tune: 5695 5696 (("origin/maint" . "\\`hotfix/") 5697 ("origin/master" . "\\`feature/")) 5698 5699 UPSTREAM can be a local branch: 5700 5701 (("master" . ("master" "next" "maint"))) 5702 5703 Because the main branch is no longer almost always named "master" you 5704 should also account for other common names: 5705 5706 (("main" . ("main" "master" "next" "maint")) 5707 ("master" . ("main" "master" "next" "maint"))) 5708 5709 -- Command: magit-branch-orphan 5710 This command creates and checks out a new orphan branch with 5711 contents from a given revision. 5712 5713 -- Command: magit-branch-or-checkout 5714 This command is a hybrid between ‘magit-checkout’ and 5715 ‘magit-branch-and-checkout’ and is intended as a replacement for 5716 the former in ‘magit-branch’. 5717 5718 It first asks the user for an existing branch or revision. If the 5719 user input actually can be resolved as a branch or revision, then 5720 it checks that out, just like ‘magit-checkout’ would. 5721 5722 Otherwise it creates and checks out a new branch using the input as 5723 its name. Before doing so it reads the starting-point for the new 5724 branch. This is similar to what ‘magit-branch-and-checkout’ does. 5725 5726 To use this command instead of ‘magit-checkout’ add this to your 5727 init file: 5728 5729 (transient-replace-suffix 'magit-branch 'magit-checkout 5730 '("b" "dwim" magit-branch-or-checkout)) 5731 5732 5733 File: magit.info, Node: Branch Git Variables, Next: Auxiliary Branch Commands, Prev: Branch Commands, Up: Branching 5734 5735 6.6.3 Branch Git Variables 5736 -------------------------- 5737 5738 These variables can be set from the transient prefix command 5739 ‘magit-branch-configure’. By default they can also be set from 5740 ‘magit-branch’. See *note Branch Commands::. 5741 5742 -- Variable: branch.NAME.merge 5743 Together with ‘branch.NAME.remote’ this variable defines the 5744 upstream branch of the local branch named NAME. The value of this 5745 variable is the full reference of the upstream _branch_. 5746 5747 -- Variable: branch.NAME.remote 5748 Together with ‘branch.NAME.merge’ this variable defines the 5749 upstream branch of the local branch named NAME. The value of this 5750 variable is the name of the upstream _remote_. 5751 5752 -- Variable: branch.NAME.rebase 5753 This variable controls whether pulling into the branch named NAME 5754 is done by rebasing or by merging the fetched branch. 5755 5756 • When ‘true’ then pulling is done by rebasing. 5757 • When ‘false’ then pulling is done by merging. 5758 • When undefined then the value of ‘pull.rebase’ is used. The 5759 default of that variable is ‘false’. 5760 5761 -- Variable: branch.NAME.pushRemote 5762 This variable specifies the remote that the branch named NAME is 5763 usually pushed to. The value has to be the name of an existing 5764 remote. 5765 5766 It is not possible to specify the name of _branch_ to push the 5767 local branch to. The name of the remote branch is always the same 5768 as the name of the local branch. 5769 5770 If this variable is undefined but ‘remote.pushDefault’ is defined, 5771 then the value of the latter is used. By default 5772 ‘remote.pushDefault’ is undefined. 5773 5774 -- Variable: branch.NAME.description 5775 This variable can be used to describe the branch named NAME. That 5776 description is used, e.g., when turning the branch into a series of 5777 patches. 5778 5779 The following variables specify defaults which are used if the above 5780 branch-specific variables are not set. 5781 5782 -- Variable: pull.rebase 5783 This variable specifies whether pulling is done by rebasing or by 5784 merging. It can be overwritten using ‘branch.NAME.rebase’. 5785 5786 • When ‘true’ then pulling is done by rebasing. 5787 • When ‘false’ (the default) then pulling is done by merging. 5788 5789 Since it is never a good idea to merge the upstream branch into a 5790 feature or hotfix branch and most branches are such branches, you 5791 should consider setting this to ‘true’, and ‘branch.master.rebase’ 5792 to ‘false’. 5793 5794 -- Variable: remote.pushDefault 5795 This variable specifies what remote the local branches are usually 5796 pushed to. This can be overwritten per branch using 5797 ‘branch.NAME.pushRemote’. 5798 5799 The following variables are used during the creation of a branch and 5800 control whether the various branch-specific variables are automatically 5801 set at this time. 5802 5803 -- Variable: branch.autoSetupMerge 5804 This variable specifies under what circumstances creating a branch 5805 NAME should result in the variables ‘branch.NAME.merge’ and 5806 ‘branch.NAME.remote’ being set according to the starting point used 5807 to create the branch. If the starting point isn’t a branch, then 5808 these variables are never set. 5809 5810 • When ‘always’ then the variables are set regardless of whether 5811 the starting point is a local or a remote branch. 5812 • When ‘true’ (the default) then the variables are set when the 5813 starting point is a remote branch, but not when it is a local 5814 branch. 5815 • When ‘false’ then the variables are never set. 5816 5817 -- Variable: branch.autoSetupRebase 5818 This variable specifies whether creating a branch NAME should 5819 result in the variable ‘branch.NAME.rebase’ being set to ‘true’. 5820 5821 • When ‘always’ then the variable is set regardless of whether 5822 the starting point is a local or a remote branch. 5823 • When ‘local’ then the variable are set when the starting point 5824 is a local branch, but not when it is a remote branch. 5825 • When ‘remote’ then the variable are set when the starting 5826 point is a remote branch, but not when it is a local branch. 5827 • When ‘never’ (the default) then the variable is never set. 5828 5829 Note that the respective commands always change the repository-local 5830 values. If you want to change the global value, which is used when the 5831 local value is undefined, then you have to do so on the command line, 5832 e.g.: 5833 5834 git config --global remote.autoSetupMerge always 5835 5836 For more information about these variables you should also see *note 5837 (gitman)git-config::. Also see *note (gitman)git-branch::. , *note 5838 (gitman)git-checkout::. and *note Pushing::. 5839 5840 -- User Option: magit-prefer-remote-upstream 5841 This option controls whether commands that read a branch from the 5842 user and then set it as the upstream branch, offer a local or a 5843 remote branch as default completion candidate, when they have the 5844 choice. 5845 5846 This affects all commands that use ‘magit-read-upstream-branch’ or 5847 ‘magit-read-starting-point’, which includes all commands that 5848 change the upstream and many which create new branches. 5849 5850 5851 File: magit.info, Node: Auxiliary Branch Commands, Prev: Branch Git Variables, Up: Branching 5852 5853 6.6.4 Auxiliary Branch Commands 5854 ------------------------------- 5855 5856 These commands are not available from the transient ‘magit-branch’ by 5857 default. 5858 5859 -- Command: magit-branch-shelve 5860 This command shelves a branch. This is done by deleting the 5861 branch, and creating a new reference "refs/shelved/BRANCH-NAME" 5862 pointing at the same commit as the branch pointed at. If the 5863 deleted branch had a reflog, then that is preserved as the reflog 5864 of the new reference. 5865 5866 This is useful if you want to move a branch out of sight, but are 5867 not ready to completely discard it yet. 5868 5869 -- Command: magit-branch-unshelve 5870 This command unshelves a branch that was previously shelved using 5871 ‘magit-branch-shelve’. This is done by deleting the reference 5872 "refs/shelved/BRANCH-NAME" and creating a branch "BRANCH-NAME" 5873 pointing at the same commit as the deleted reference pointed at. 5874 If the deleted reference had a reflog, then that is restored as the 5875 reflog of the branch. 5876 5877 5878 File: magit.info, Node: Merging, Next: Resolving Conflicts, Prev: Branching, Up: Manipulating 5879 5880 6.7 Merging 5881 =========== 5882 5883 Also see *note (gitman)git-merge::. For information on how to resolve 5884 merge conflicts see the next section. 5885 5886 ‘m’ (‘magit-merge’) 5887 This transient prefix command binds the following suffix commands 5888 along with the appropriate infix arguments and displays them in a 5889 temporary buffer until a suffix is invoked. 5890 5891 When no merge is in progress, then the transient features the 5892 following suffix commands. 5893 5894 ‘m m’ (‘magit-merge-plain’) 5895 This command merges another branch or an arbitrary revision into 5896 the current branch. The branch or revision to be merged is read in 5897 the minibuffer and defaults to the branch at point. 5898 5899 Unless there are conflicts or a prefix argument is used, then the 5900 resulting merge commit uses a generic commit message, and the user 5901 does not get a chance to inspect or change it before the commit is 5902 created. With a prefix argument this does not actually create the 5903 merge commit, which makes it possible to inspect how conflicts were 5904 resolved and to adjust the commit message. 5905 5906 ‘m e’ (‘magit-merge-editmsg’) 5907 This command merges another branch or an arbitrary revision into 5908 the current branch and opens a commit message buffer, so that the 5909 user can make adjustments. The commit is not actually created 5910 until the user finishes with ‘C-c C-c’. 5911 5912 ‘m n’ (‘magit-merge-nocommit’) 5913 This command merges another branch or an arbitrary revision into 5914 the current branch, but does not actually create the merge commit. 5915 The user can then further adjust the merge, even when automatic 5916 conflict resolution succeeded and/or adjust the commit message. 5917 5918 ‘m a’ (‘magit-merge-absorb’) 5919 This command merges another local branch into the current branch 5920 and then removes the former. 5921 5922 Before the source branch is merged, it is first force pushed to its 5923 push-remote, provided the respective remote branch already exists. 5924 This ensures that the respective pull-request (if any) won’t get 5925 stuck on some obsolete version of the commits that are being 5926 merged. Finally, if ‘magit-branch-pull-request’ was used to create 5927 the merged branch, then the respective remote branch is also 5928 removed. 5929 5930 ‘m i’ (‘magit-merge-into’) 5931 This command merges the current branch into another local branch 5932 and then removes the former. The latter becomes the new current 5933 branch. 5934 5935 Before the source branch is merged, it is first force pushed to its 5936 push-remote, provided the respective remote branch already exists. 5937 This ensures that the respective pull-request (if any) won’t get 5938 stuck on some obsolete version of the commits that are being 5939 merged. Finally, if ‘magit-branch-pull-request’ was used to create 5940 the merged branch, then the respective remote branch is also 5941 removed. 5942 5943 ‘m s’ (‘magit-merge-squash’) 5944 This command squashes the changes introduced by another branch or 5945 an arbitrary revision into the current branch. This only applies 5946 the changes made by the squashed commits. No information is 5947 preserved that would allow creating an actual merge commit. 5948 Instead of this command you should probably use a command from the 5949 apply transient. 5950 5951 ‘m p’ (‘magit-merge-preview’) 5952 This command shows a preview of merging another branch or an 5953 arbitrary revision into the current branch. 5954 5955 Note that commands, that normally change how a diff is displayed, 5956 do not work in buffers created by this command, because the 5957 underlying Git command does not support diff arguments. 5958 5959 When a merge is in progress, then the transient instead features the 5960 following suffix commands. 5961 5962 ‘m m’ (‘magit-merge’) 5963 After the user resolved conflicts, this command proceeds with the 5964 merge. If some conflicts weren’t resolved, then this command 5965 fails. 5966 5967 ‘m a’ (‘magit-merge-abort’) 5968 This command aborts the current merge operation. 5969 5970 5971 File: magit.info, Node: Resolving Conflicts, Next: Rebasing, Prev: Merging, Up: Manipulating 5972 5973 6.8 Resolving Conflicts 5974 ======================= 5975 5976 When merging branches (or otherwise combining or changing history) 5977 conflicts can occur. If you edited two completely different parts of 5978 the same file in two branches and then merge one of these branches into 5979 the other, then Git can resolve that on its own, but if you edit the 5980 same area of a file, then a human is required to decide how the two 5981 versions, or "sides of the conflict", are to be combined into one. 5982 5983 Here we can only provide a brief introduction to the subject and 5984 point you toward some tools that can help. If you are new to this, then 5985 please also consult Git’s own documentation as well as other resources. 5986 5987 If a file has conflicts and Git cannot resolve them by itself, then 5988 it puts both versions into the affected file along with special markers 5989 whose purpose is to denote the boundaries of the unresolved part of the 5990 file and between the different versions. These boundary lines begin 5991 with the strings consisting of seven times the same character, one of 5992 ‘<’, ‘|’, ‘=’ and ‘>’, and are followed by information about the source 5993 of the respective versions, e.g.: 5994 5995 <<<<<<< HEAD 5996 Take the blue pill. 5997 ======= 5998 Take the red pill. 5999 >>>>>>> feature 6000 6001 In this case you have chosen to take the red pill on one branch and 6002 on another you picked the blue pill. Now that you are merging these two 6003 diverging branches, Git cannot possibly know which pill you want to 6004 take. 6005 6006 To resolve that conflict you have to create a version of the affected 6007 area of the file by keeping only one of the sides, possibly by editing 6008 it in order to bring in the changes from the other side, remove the 6009 other versions as well as the markers, and then stage the result. A 6010 possible resolution might be: 6011 6012 Take both pills. 6013 6014 Often it is useful to see not only the two sides of the conflict but 6015 also the "original" version from before the same area of the file was 6016 modified twice on different branches. Instruct Git to insert that 6017 version as well by running this command once: 6018 6019 git config --global merge.conflictStyle diff3 6020 6021 The above conflict might then have looked like this: 6022 6023 <<<<<<< HEAD 6024 Take the blue pill. 6025 ||||||| merged common ancestors 6026 Take either the blue or the red pill, but not both. 6027 ======= 6028 Take the red pill. 6029 >>>>>>> feature 6030 6031 If that were the case, then the above conflict resolution would not 6032 have been correct, which demonstrates why seeing the original version 6033 alongside the conflicting versions can be useful. 6034 6035 You can perform the conflict resolution completely by hand, but Emacs 6036 also provides some packages that help in the process: Smerge, Ediff 6037 (*note (ediff)Top::), and Emerge (*note (emacs)Emerge::). Magit does 6038 not provide its own tools for conflict resolution, but it does make 6039 using Smerge and Ediff more convenient. (Ediff supersedes Emerge, so 6040 you probably don’t want to use the latter anyway.) 6041 6042 In the Magit status buffer, files with unresolved conflicts are 6043 listed in the "Unstaged changes" and/or "Staged changes" sections. They 6044 are prefixed with the word "unmerged", which in this context essentially 6045 is a synonym for "unresolved". 6046 6047 Pressing ‘RET’ while point is on such a file section shows a buffer 6048 visiting that file, turns on ‘smerge-mode’ in that buffer, and places 6049 point inside the first area with conflicts. You should then resolve 6050 that conflict using regular edit commands and/or Smerge commands. 6051 6052 Unfortunately Smerge does not have a manual, but you can get a list 6053 of commands and binding ‘C-c ^ C-h’ and press ‘RET’ while point is on a 6054 command name to read its documentation. 6055 6056 Normally you would edit one version and then tell Smerge to keep only 6057 that version. Use ‘C-c ^ m’ (‘smerge-keep-mine’) to keep the ‘HEAD’ 6058 version or ‘C-c ^ o’ (‘smerge-keep-other’) to keep the version that 6059 follows "|||||||". Then use ‘C-c ^ n’ to move to the next conflicting 6060 area in the same file. Once you are done resolving conflicts, return to 6061 the Magit status buffer. The file should now be shown as "modified", no 6062 longer as "unmerged", because Smerge automatically stages the file when 6063 you save the buffer after resolving the last conflict. 6064 6065 Magit now wraps the mentioned Smerge commands, allowing you to use 6066 these key bindings without having to go to the file-visiting buffer. 6067 Additionally ‘k’ (‘magit-discard’) on a hunk with unresolved conflicts 6068 asks which side to keep or, if point is on a side, then it keeps it 6069 without prompting. Similarly ‘k’ on a unresolved file ask which side to 6070 keep. 6071 6072 Alternatively you could use Ediff, which uses separate buffers for 6073 the different versions of the file. To resolve conflicts in a file 6074 using Ediff press ‘e’ while point is on such a file in the status 6075 buffer. 6076 6077 Ediff can be used for other purposes as well. For more information 6078 on how to enter Ediff from Magit, see *note Ediffing::. Explaining how 6079 to use Ediff is beyond the scope of this manual, instead see *note 6080 (ediff)Top::. 6081 6082 If you are unsure whether you should Smerge or Ediff, then use the 6083 former. It is much easier to understand and use, and except for truly 6084 complex conflicts, the latter is usually overkill. 6085 6086 6087 File: magit.info, Node: Rebasing, Next: Cherry Picking, Prev: Resolving Conflicts, Up: Manipulating 6088 6089 6.9 Rebasing 6090 ============ 6091 6092 Also see *note (gitman)git-rebase::. For information on how to resolve 6093 conflicts that occur during rebases see the preceding section. 6094 6095 ‘r’ (‘magit-rebase’) 6096 This transient prefix command binds the following suffix commands 6097 along with the appropriate infix arguments and displays them in a 6098 temporary buffer until a suffix is invoked. 6099 6100 When no rebase is in progress, then the transient features the 6101 following suffix commands. 6102 6103 Using one of these commands _starts_ a rebase sequence. Git might 6104 then stop somewhere along the way, either because you told it to do so, 6105 or because applying a commit failed due to a conflict. When that 6106 happens, then the status buffer shows information about the rebase 6107 sequence which is in progress in a section similar to a log section. 6108 See *note Information About In-Progress Rebase::. 6109 6110 For information about the upstream and the push-remote, see *note The 6111 Two Remotes::. 6112 6113 ‘r p’ (‘magit-rebase-onto-pushremote’) 6114 This command rebases the current branch onto its push-remote. 6115 6116 With a prefix argument or when the push-remote is either not 6117 configured or unusable, then let the user first configure the 6118 push-remote. 6119 6120 ‘r u’ (‘magit-rebase-onto-upstream’) 6121 This command rebases the current branch onto its upstream branch. 6122 6123 With a prefix argument or when the upstream is either not 6124 configured or unusable, then let the user first configure the 6125 upstream. 6126 6127 ‘r e’ (‘magit-rebase-branch’) 6128 This command rebases the current branch onto a branch read in the 6129 minibuffer. All commits that are reachable from head but not from 6130 the selected branch TARGET are being rebased. 6131 6132 ‘r s’ (‘magit-rebase-subset’) 6133 This command starts a non-interactive rebase sequence to transfer 6134 commits from START to ‘HEAD’ onto NEWBASE. START has to be 6135 selected from a list of recent commits. 6136 6137 By default Magit uses the ‘--autostash’ argument, which causes 6138 uncommitted changes to be stored in a stash before the rebase begins. 6139 These changes are restored after the rebase completes and if possible 6140 the stash is removed. If the stash does not apply cleanly, then the 6141 stash is not removed. In case something goes wrong when resolving the 6142 conflicts, this allows you to start over. 6143 6144 Even though one of the actions is dedicated to interactive rebases, 6145 the transient also features the infix argument ‘--interactive’. This 6146 can be used to turn one of the other, non-interactive rebase variants 6147 into an interactive rebase. 6148 6149 For example if you want to clean up a feature branch and at the same 6150 time rebase it onto ‘master’, then you could use ‘r-iu’. But we 6151 recommend that you instead do that in two steps. First use ‘ri’ to 6152 cleanup the feature branch, and then in a second step ‘ru’ to rebase it 6153 onto ‘master’. That way if things turn out to be more complicated than 6154 you thought and/or you make a mistake and have to start over, then you 6155 only have to redo half the work. 6156 6157 Explicitly enabling ‘--interactive’ won’t have an effect on the 6158 following commands as they always use that argument anyway, even if it 6159 is not enabled in the transient. 6160 6161 ‘r i’ (‘magit-rebase-interactive’) 6162 This command starts an interactive rebase sequence. 6163 6164 ‘r f’ (‘magit-rebase-autosquash’) 6165 This command combines squash and fixup commits with their intended 6166 targets. 6167 6168 ‘r m’ (‘magit-rebase-edit-commit’) 6169 This command starts an interactive rebase sequence that lets the 6170 user edit a single older commit. 6171 6172 ‘r w’ (‘magit-rebase-reword-commit’) 6173 This command starts an interactive rebase sequence that lets the 6174 user reword a single older commit. 6175 6176 ‘r k’ (‘magit-rebase-remove-commit’) 6177 This command removes a single older commit using rebase. 6178 6179 When a rebase is in progress, then the transient instead features the 6180 following suffix commands. 6181 6182 ‘r r’ (‘magit-rebase-continue’) 6183 This command restart the current rebasing operation. 6184 6185 In some cases this pops up a commit message buffer for you do edit. 6186 With a prefix argument the old message is reused as-is. 6187 6188 ‘r s’ (‘magit-rebase-skip’) 6189 This command skips the current commit and restarts the current 6190 rebase operation. 6191 6192 ‘r e’ (‘magit-rebase-edit’) 6193 This command lets the user edit the todo list of the current rebase 6194 operation. 6195 6196 ‘r a’ (‘magit-rebase-abort’) 6197 This command aborts the current rebase operation, restoring the 6198 original branch. 6199 6200 * Menu: 6201 6202 * Editing Rebase Sequences:: 6203 * Information About In-Progress Rebase:: 6204 6205 6206 File: magit.info, Node: Editing Rebase Sequences, Next: Information About In-Progress Rebase, Up: Rebasing 6207 6208 6.9.1 Editing Rebase Sequences 6209 ------------------------------ 6210 6211 ‘C-c C-c’ (‘with-editor-finish’) 6212 Finish the current editing session by returning with exit code 0. 6213 Git then uses the rebase instructions it finds in the file. 6214 6215 ‘C-c C-k’ (‘with-editor-cancel’) 6216 Cancel the current editing session by returning with exit code 1. 6217 Git then forgoes starting the rebase sequence. 6218 6219 ‘<RET>’ (‘git-rebase-show-commit’) 6220 Show the commit on the current line in another buffer and select 6221 that buffer. 6222 6223 ‘<SPC>’ (‘git-rebase-show-or-scroll-up’) 6224 Show the commit on the current line in another buffer without 6225 selecting that buffer. If the revision buffer is already visible 6226 in another window of the current frame, then instead scroll that 6227 window up. 6228 6229 ‘<DEL>’ (‘git-rebase-show-or-scroll-down’) 6230 Show the commit on the current line in another buffer without 6231 selecting that buffer. If the revision buffer is already visible 6232 in another window of the current frame, then instead scroll that 6233 window down. 6234 6235 ‘p’ (‘git-rebase-backward-line’) 6236 Move to previous line. 6237 6238 ‘n’ (‘forward-line’) 6239 Move to next line. 6240 6241 ‘M-p’ (‘git-rebase-move-line-up’) 6242 Move the current commit (or command) up. 6243 6244 ‘M-n’ (‘git-rebase-move-line-down’) 6245 Move the current commit (or command) down. 6246 6247 ‘r’ (‘git-rebase-reword’) 6248 Edit message of commit on current line. 6249 6250 ‘e’ (‘git-rebase-edit’) 6251 Stop at the commit on the current line. 6252 6253 ‘s’ (‘git-rebase-squash’) 6254 Meld commit on current line into previous commit, and edit message. 6255 6256 ‘f’ (‘git-rebase-fixup’) 6257 Meld commit on current line into previous commit, discarding the 6258 current commit’s message. 6259 6260 ‘k’ (‘git-rebase-kill-line’) 6261 Kill the current action line. 6262 6263 ‘c’ (‘git-rebase-pick’) 6264 Use commit on current line. 6265 6266 ‘x’ (‘git-rebase-exec’) 6267 Insert a shell command to be run after the proceeding commit. 6268 6269 If there already is such a command on the current line, then edit 6270 that instead. With a prefix argument insert a new command even 6271 when there already is one on the current line. With empty input 6272 remove the command on the current line, if any. 6273 6274 ‘b’ (‘git-rebase-break’) 6275 Insert a break action before the current line, instructing Git to 6276 return control to the user. 6277 6278 ‘y’ (‘git-rebase-insert’) 6279 Read an arbitrary commit and insert it below current line. 6280 6281 ‘C-x u’ (‘git-rebase-undo’) 6282 Undo some previous changes. Like ‘undo’ but works in read-only 6283 buffers. 6284 6285 -- User Option: git-rebase-auto-advance 6286 Whether to move to next line after changing a line. 6287 6288 -- User Option: git-rebase-show-instructions 6289 Whether to show usage instructions inside the rebase buffer. 6290 6291 -- User Option: git-rebase-confirm-cancel 6292 Whether confirmation is required to cancel. 6293 6294 When a rebase is performed with the ‘--rebase-merges’ option, the 6295 sequence will include a few other types of actions and the following 6296 commands become relevant. 6297 6298 ‘l’ (‘git-rebase-label’) 6299 This commands inserts a label action or edits the one at point. 6300 6301 ‘t’ (‘git-rebase-reset’) 6302 This command inserts a reset action or edits the one at point. The 6303 prompt will offer the labels that are currently present in the 6304 buffer. 6305 6306 ‘MM’ (‘git-rebase-merge’) 6307 The command inserts a merge action or edits the one at point. The 6308 prompt will offer the labels that are currently present in the 6309 buffer. Specifying a message to reuse via ‘-c’ or ‘-C’ is not 6310 supported; an editor will always be invoked for the merge. 6311 6312 ‘Mt’ (‘git-rebase-merge-toggle-editmsg’) 6313 This command toggles between the ‘-C’ and ‘-c’ options of the merge 6314 action at point. These options both specify a commit whose message 6315 should be reused. The lower-case variant instructs Git to invoke 6316 the editor when creating the merge, allowing the user to edit the 6317 message. 6318 6319 6320 File: magit.info, Node: Information About In-Progress Rebase, Prev: Editing Rebase Sequences, Up: Rebasing 6321 6322 6.9.2 Information About In-Progress Rebase 6323 ------------------------------------------ 6324 6325 While a rebase sequence is in progress, the status buffer features a 6326 section that lists the commits that have already been applied as well as 6327 the commits that still have to be applied. 6328 6329 The commits are split in two halves. When rebase stops at a commit, 6330 either because the user has to deal with a conflict or because s/he 6331 explicitly requested that rebase stops at that commit, then point is 6332 placed on the commit that separates the two groups, i.e., on ‘HEAD’. 6333 The commits above it have not been applied yet, while the ‘HEAD’ and the 6334 commits below it have already been applied. In between these two groups 6335 of applied and yet-to-be applied commits, there sometimes is a commit 6336 which has been dropped. 6337 6338 Each commit is prefixed with a word and these words are additionally 6339 shown in different colors to indicate the status of the commits. 6340 6341 The following colors are used: 6342 6343 • Commits that use the same foreground color as the ‘default’ face 6344 have not been applied yet. 6345 6346 • Yellow commits have some special relationship to the commit rebase 6347 stopped at. This is used for the words "join", "goal", "same" and 6348 "work" (see below). 6349 6350 • Gray commits have already been applied. 6351 6352 • The blue commit is the ‘HEAD’ commit. 6353 6354 • The green commit is the commit the rebase sequence stopped at. If 6355 this is the same commit as ‘HEAD’ (e.g., because you haven’t done 6356 anything yet after rebase stopped at the commit, then this commit 6357 is shown in blue, not green). There can only be a green *and* a 6358 blue commit at the same time, if you create one or more new commits 6359 after rebase stops at a commit. 6360 6361 • Red commits have been dropped. They are shown for reference only, 6362 e.g., to make it easier to diff. 6363 6364 Of course these colors are subject to the color-theme in use. 6365 6366 The following words are used: 6367 6368 • Commits prefixed with ‘pick’, ‘reword’, ‘edit’, ‘squash’, and 6369 ‘fixup’ have not been applied yet. These words have the same 6370 meaning here as they do in the buffer used to edit the rebase 6371 sequence. See *note Editing Rebase Sequences::. When the 6372 ‘--rebase-merges’ option was specified, ‘reset’, ‘label’, and 6373 ‘merge’ lines may also be present. 6374 6375 • Commits prefixed with ‘done’ and ‘onto’ have already been applied. 6376 It is possible for such a commit to be the ‘HEAD’, in which case it 6377 is blue. Otherwise it is grey. 6378 6379 • The commit prefixed with ‘onto’ is the commit on top of which 6380 all the other commits are being re-applied. This commit 6381 itself did not have to be re-applied, it is the commit rebase 6382 did rewind to before starting to re-apply other commits. 6383 6384 • Commits prefixed with ‘done’ have already been re-applied. 6385 This includes commits that have been re-applied but also new 6386 commits that you have created during the rebase. 6387 6388 • All other commits, those not prefixed with any of the above words, 6389 are in some way related to the commit at which rebase stopped. 6390 6391 To determine whether a commit is related to the stopped-at commit 6392 their hashes, trees and patch-ids (1) are being compared. The 6393 commit message is not used for this purpose. 6394 6395 Generally speaking commits that are related to the stopped-at 6396 commit can have any of the used colors, though not all color/word 6397 combinations are possible. 6398 6399 Words used for stopped-at commits are: 6400 6401 • When a commit is prefixed with ‘void’, then that indicates 6402 that Magit knows for sure that all the changes in that commit 6403 have been applied using several new commits. This commit is 6404 no longer reachable from ‘HEAD’, and it also isn’t one of the 6405 commits that will be applied when resuming the session. 6406 6407 • When a commit is prefixed with ‘join’, then that indicates 6408 that the rebase sequence stopped at that commit due to a 6409 conflict - you now have to join (merge) the changes with what 6410 has already been applied. In a sense this is the commit 6411 rebase stopped at, but while its effect is already in the 6412 index and in the worktree (with conflict markers), the commit 6413 itself has not actually been applied yet (it isn’t the 6414 ‘HEAD’). So it is shown in yellow, like the other commits 6415 that still have to be applied. 6416 6417 • When a commit is prefixed with ‘stop’ or a _blue_ or _green_ 6418 ‘same’, then that indicates that rebase stopped at this 6419 commit, that it is still applied or has been applied again, 6420 and that at least its patch-id is unchanged. 6421 6422 • When a commit is prefixed with ‘stop’, then that 6423 indicates that rebase stopped at that commit because you 6424 requested that earlier, and its patch-id is unchanged. 6425 It might even still be the exact same commit. 6426 6427 • When a commit is prefixed with a _blue_ or _green_ 6428 ‘same’, then that indicates that while its tree or hash 6429 changed, its patch-id did not. If it is blue, then it is 6430 the ‘HEAD’ commit (as always for blue). When it is 6431 green, then it no longer is ‘HEAD’ because other commit 6432 have been created since (but before continuing the 6433 rebase). 6434 6435 • When a commit is prefixed with ‘goal’, a _yellow_ ‘same,’ or 6436 ‘work’, then that indicates that rebase applied that commit 6437 but that you then reset ‘HEAD’ to an earlier commit (likely to 6438 split it up into multiple commits), and that there are some 6439 uncommitted changes remaining which likely (but not 6440 necessarily) originate from that commit. 6441 6442 • When a commit is prefixed with ‘goal’, then that 6443 indicates that it is still possible to create a new 6444 commit with the exact same tree (the "goal") without 6445 manually editing any files, by committing the index, or 6446 by staging all changes and then committing that. This is 6447 the case when the original tree still exists in the index 6448 or worktree in untainted form. 6449 6450 • When a commit is prefixed with a yellow ‘same’, then that 6451 indicates that it is no longer possible to create a 6452 commit with the exact same tree, but that it is still 6453 possible to create a commit with the same patch-id. This 6454 would be the case if you created a new commit with other 6455 changes, but the changes from the original commit still 6456 exist in the index or working tree in untainted form. 6457 6458 • When a commit is prefixed with ‘work’, then that 6459 indicates that you reset ‘HEAD’ to an earlier commit, and 6460 that there are some staged and/or unstaged changes 6461 (likely, but not necessarily) originating from that 6462 commit. However it is no longer possible to create a new 6463 commit with the same tree or at least the same patch-id 6464 because you have already made other changes. 6465 6466 • When a commit is prefixed with ‘poof’ or ‘gone’, then that 6467 indicates that rebase applied that commit but that you then 6468 reset ‘HEAD’ to an earlier commit (likely to split it up into 6469 multiple commits), and that there are no uncommitted changes. 6470 6471 • When a commit is prefixed with ‘poof’, then that 6472 indicates that it is no longer reachable from ‘HEAD’, but 6473 that it has been replaced with one or more commits, which 6474 together have the exact same effect. 6475 6476 • When a commit is prefixed with ‘gone’, then that 6477 indicates that it is no longer reachable from ‘HEAD’ and 6478 that we also cannot determine whether its changes are 6479 still in effect in one or more new commits. They might 6480 be, but if so, then there must also be other changes 6481 which makes it impossible to know for sure. 6482 6483 Do not worry if you do not fully understand the above. That’s okay, 6484 you will acquire a good enough understanding through practice. 6485 6486 For other sequence operations such as cherry-picking, a similar 6487 section is displayed, but they lack some of the features described 6488 above, due to limitations in the git commands used to implement them. 6489 Most importantly these sequences only support "picking" a commit but not 6490 other actions such as "rewording", and they do not keep track of the 6491 commits which have already been applied. 6492 6493 ---------- Footnotes ---------- 6494 6495 (1) The patch-id is a hash of the _changes_ introduced by a commit. 6496 It differs from the hash of the commit itself, which is a hash of the 6497 result of applying that change (i.e., the resulting trees and blobs) as 6498 well as author and committer information, the commit message, and the 6499 hashes of the parents of the commit. The patch-id hash on the other 6500 hand is created only from the added and removed lines, even line numbers 6501 and whitespace changes are ignored when calculating this hash. The 6502 patch-ids of two commits can be used to answer the question "Do these 6503 commits make the same change?". 6504 6505 6506 File: magit.info, Node: Cherry Picking, Next: Resetting, Prev: Rebasing, Up: Manipulating 6507 6508 6.10 Cherry Picking 6509 =================== 6510 6511 Also see *note (gitman)git-cherry-pick::. 6512 6513 ‘A’ (‘magit-cherry-pick’) 6514 This transient prefix command binds the following suffix commands 6515 along with the appropriate infix arguments and displays them in a 6516 temporary buffer until a suffix is invoked. 6517 6518 When no cherry-pick or revert is in progress, then the transient 6519 features the following suffix commands. 6520 6521 ‘A A’ (‘magit-cherry-copy’) 6522 This command copies COMMITS from another branch onto the current 6523 branch. If the region selects multiple commits, then those are 6524 copied, without prompting. Otherwise the user is prompted for a 6525 commit or range, defaulting to the commit at point. 6526 6527 ‘A a’ (‘magit-cherry-apply’) 6528 This command applies the changes in COMMITS from another branch 6529 onto the current branch. If the region selects multiple commits, 6530 then those are used, without prompting. Otherwise the user is 6531 prompted for a commit or range, defaulting to the commit at point. 6532 6533 This command also has a top-level binding, which can be invoked 6534 without using the transient by typing ‘a’ at the top-level. 6535 6536 The following commands not only apply some commits to some branch, 6537 but also remove them from some other branch. The removal is performed 6538 using either ‘git-update-ref’ or if necessary ‘git-rebase’. Both 6539 applying commits as well as removing them using ‘git-rebase’ can lead to 6540 conflicts. If that happens, then these commands abort and you not only 6541 have to resolve the conflicts but also finish the process the same way 6542 you would have to if these commands didn’t exist at all. 6543 6544 ‘A h’ (‘magit-cherry-harvest’) 6545 This command moves the selected COMMITS that must be located on 6546 another BRANCH onto the current branch instead, removing them from 6547 the former. When this command succeeds, then the same branch is 6548 current as before. 6549 6550 Applying the commits on the current branch or removing them from 6551 the other branch can lead to conflicts. When that happens, then 6552 this command stops and you have to resolve the conflicts and then 6553 finish the process manually. 6554 6555 ‘A d’ (‘magit-cherry-donate’) 6556 This command moves the selected COMMITS from the current branch 6557 onto another existing BRANCH, removing them from the former. When 6558 this command succeeds, then the same branch is current as before. 6559 ‘HEAD’ is allowed to be detached initially. 6560 6561 Applying the commits on the other branch or removing them from the 6562 current branch can lead to conflicts. When that happens, then this 6563 command stops and you have to resolve the conflicts and then finish 6564 the process manually. 6565 6566 ‘A n’ (‘magit-cherry-spinout’) 6567 This command moves the selected COMMITS from the current branch 6568 onto a new branch BRANCH, removing them from the former. When this 6569 command succeeds, then the same branch is current as before. 6570 6571 Applying the commits on the other branch or removing them from the 6572 current branch can lead to conflicts. When that happens, then this 6573 command stops and you have to resolve the conflicts and then finish 6574 the process manually. 6575 6576 ‘A s’ (‘magit-cherry-spinoff’) 6577 This command moves the selected COMMITS from the current branch 6578 onto a new branch BRANCH, removing them from the former. When this 6579 command succeeds, then the new branch is checked out. 6580 6581 Applying the commits on the other branch or removing them from the 6582 current branch can lead to conflicts. When that happens, then this 6583 command stops and you have to resolve the conflicts and then finish 6584 the process manually. 6585 6586 When a cherry-pick or revert is in progress, then the transient 6587 instead features the following suffix commands. 6588 6589 ‘A A’ (‘magit-sequence-continue’) 6590 Resume the current cherry-pick or revert sequence. 6591 6592 ‘A s’ (‘magit-sequence-skip’) 6593 Skip the stopped at commit during a cherry-pick or revert sequence. 6594 6595 ‘A a’ (‘magit-sequence-abort’) 6596 Abort the current cherry-pick or revert sequence. This discards 6597 all changes made since the sequence started. 6598 6599 * Menu: 6600 6601 * Reverting:: 6602 6603 6604 File: magit.info, Node: Reverting, Up: Cherry Picking 6605 6606 6.10.1 Reverting 6607 ---------------- 6608 6609 ‘V’ (‘magit-revert’) 6610 This transient prefix command binds the following suffix commands 6611 along with the appropriate infix arguments and displays them in a 6612 temporary buffer until a suffix is invoked. 6613 6614 When no cherry-pick or revert is in progress, then the transient 6615 features the following suffix commands. 6616 6617 ‘V V’ (‘magit-revert-and-commit’) 6618 Revert a commit by creating a new commit. Prompt for a commit, 6619 defaulting to the commit at point. If the region selects multiple 6620 commits, then revert all of them, without prompting. 6621 6622 ‘V v’ (‘magit-revert-no-commit’) 6623 Revert a commit by applying it in reverse to the working tree. 6624 Prompt for a commit, defaulting to the commit at point. If the 6625 region selects multiple commits, then revert all of them, without 6626 prompting. 6627 6628 When a cherry-pick or revert is in progress, then the transient 6629 instead features the following suffix commands. 6630 6631 ‘V V’ (‘magit-sequence-continue’) 6632 Resume the current cherry-pick or revert sequence. 6633 6634 ‘V s’ (‘magit-sequence-skip’) 6635 Skip the stopped at commit during a cherry-pick or revert sequence. 6636 6637 ‘V a’ (‘magit-sequence-abort’) 6638 Abort the current cherry-pick or revert sequence. This discards 6639 all changes made since the sequence started. 6640 6641 6642 File: magit.info, Node: Resetting, Next: Stashing, Prev: Cherry Picking, Up: Manipulating 6643 6644 6.11 Resetting 6645 ============== 6646 6647 Also see *note (gitman)git-reset::. 6648 6649 ‘x’ (‘magit-reset-quickly’) 6650 Reset the ‘HEAD’ and index to some commit read from the user and 6651 defaulting to the commit at point, and possibly also reset the 6652 working tree. With a prefix argument reset the working tree 6653 otherwise don’t. 6654 6655 ‘X m’ (‘magit-reset-mixed’) 6656 Reset the ‘HEAD’ and index to some commit read from the user and 6657 defaulting to the commit at point. The working tree is kept as-is. 6658 6659 ‘X s’ (‘magit-reset-soft’) 6660 Reset the ‘HEAD’ to some commit read from the user and defaulting 6661 to the commit at point. The index and the working tree are kept 6662 as-is. 6663 6664 ‘X h’ (‘magit-reset-hard’) 6665 Reset the ‘HEAD’, index, and working tree to some commit read from 6666 the user and defaulting to the commit at point. 6667 6668 ‘X k’ (‘magit-reset-keep’) 6669 Reset the ‘HEAD’, index, and working tree to some commit read from 6670 the user and defaulting to the commit at point. Uncommitted 6671 changes are kept as-is. 6672 6673 ‘X i’ (‘magit-reset-index’) 6674 Reset the index to some commit read from the user and defaulting to 6675 the commit at point. Keep the ‘HEAD’ and working tree as-is, so if 6676 the commit refers to the ‘HEAD’, then this effectively unstages all 6677 changes. 6678 6679 ‘X w’ (‘magit-reset-worktree’) 6680 Reset the working tree to some commit read from the user and 6681 defaulting to the commit at point. Keep the ‘HEAD’ and index 6682 as-is. 6683 6684 ‘X f’ (‘magit-file-checkout’) 6685 Update file in the working tree and index to the contents from a 6686 revision. Both the revision and file are read from the user. 6687 6688 6689 File: magit.info, Node: Stashing, Prev: Resetting, Up: Manipulating 6690 6691 6.12 Stashing 6692 ============= 6693 6694 Also see *note (gitman)git-stash::. 6695 6696 ‘z’ (‘magit-stash’) 6697 This transient prefix command binds the following suffix commands 6698 along with the appropriate infix arguments and displays them in a 6699 temporary buffer until a suffix is invoked. 6700 6701 ‘z z’ (‘magit-stash-both’) 6702 Create a stash of the index and working tree. Untracked files are 6703 included according to infix arguments. One prefix argument is 6704 equivalent to ‘--include-untracked’ while two prefix arguments are 6705 equivalent to ‘--all’. 6706 6707 ‘z i’ (‘magit-stash-index’) 6708 Create a stash of the index only. Unstaged and untracked changes 6709 are not stashed. 6710 6711 ‘z w’ (‘magit-stash-worktree’) 6712 Create a stash of unstaged changes in the working tree. Untracked 6713 files are included according to infix arguments. One prefix 6714 argument is equivalent to ‘--include-untracked’ while two prefix 6715 arguments are equivalent to ‘--all’. 6716 6717 ‘z x’ (‘magit-stash-keep-index’) 6718 Create a stash of the index and working tree, keeping index intact. 6719 Untracked files are included according to infix arguments. One 6720 prefix argument is equivalent to ‘--include-untracked’ while two 6721 prefix arguments are equivalent to ‘--all’. 6722 6723 ‘z Z’ (‘magit-snapshot-both’) 6724 Create a snapshot of the index and working tree. Untracked files 6725 are included according to infix arguments. One prefix argument is 6726 equivalent to ‘--include-untracked’ while two prefix arguments are 6727 equivalent to ‘--all’. 6728 6729 ‘z I’ (‘magit-snapshot-index’) 6730 Create a snapshot of the index only. Unstaged and untracked 6731 changes are not stashed. 6732 6733 ‘z W’ (‘magit-snapshot-worktree’) 6734 Create a snapshot of unstaged changes in the working tree. 6735 Untracked files are included according to infix arguments. One 6736 prefix argument is equivalent to ‘--include-untracked’ while two 6737 prefix arguments are equivalent to ‘--all’-. 6738 6739 ‘z a’ (‘magit-stash-apply’) 6740 Apply a stash to the working tree. 6741 6742 When using a Git release before v2.38.0, simply run ‘git stash 6743 apply’ or with a prefix argument ‘git stash apply --index’. 6744 6745 When using Git v2.38.0 or later, behave more intelligently: 6746 6747 First try ‘git stash apply --index’, which tries to preserve the 6748 index stored in the stash, if any. This may fail because applying 6749 the stash could result in conflicts and those have to be stored in 6750 the index, making it impossible to also store the stash’s index 6751 there. 6752 6753 If the above failed, then try ‘git stash apply’. This fails (with 6754 or without ‘--index’) if there are any uncommitted changes to files 6755 that are also modified in the stash. 6756 6757 If both of the above failed, then apply using ‘git apply’. If 6758 there are no conflicting files, use ‘--3way’. If there are 6759 conflicting files, then using ‘--3way’ requires that those files 6760 are staged first, which may be undesirable, so prompt the user 6761 whether to use ‘--3way’ or ‘--reject’. 6762 6763 Customize ‘magit-no-confirm’ if you want to always use ‘--3way’, 6764 without being prompted. 6765 6766 ‘z p’ (‘magit-stash-pop’) 6767 Apply a stash to the working tree. On complete success (if the 6768 stash can be applied without any conflicts, and while preserving 6769 the stash’s index) then remove the stash from stash list. 6770 6771 When using a Git release before v2.38.0, simply run ‘git stash pop’ 6772 or with a prefix argument ‘git stash pop --index’. 6773 6774 When using Git v2.38.0 or later, behave more intelligently: 6775 6776 First try ‘git stash pop --index’, which tries to preserve the 6777 index stored in the stash, if any. This may fail because applying 6778 the stash could result in conflicts and those have to be stored in 6779 the index, making it impossible to also store the stash’s index 6780 there. 6781 6782 If the above failed, then try ‘git stash apply’. This fails (with 6783 or without ‘--index’) if there are any uncommitted changes to files 6784 that are also modified in the stash. 6785 6786 If both of the above failed, then apply using ‘git apply’. If 6787 there are no conflicting files, use ‘--3way’. If there are 6788 conflicting files, then using ‘--3way’ requires that those files 6789 are staged first, which may be undesirable, so prompt the user 6790 whether to use ‘--3way’ or ‘--reject’. 6791 6792 Customize ‘magit-no-confirm’ if you want to always use ‘--3way’, 6793 without being prompted. 6794 6795 ‘z k’ (‘magit-stash-drop’) 6796 Remove a stash from the stash list. When the region is active, 6797 offer to drop all contained stashes. 6798 6799 ‘z v’ (‘magit-stash-show’) 6800 Show all diffs of a stash in a buffer. 6801 6802 ‘z b’ (‘magit-stash-branch’) 6803 Create and checkout a new branch from an existing stash. The new 6804 branch starts at the commit that was current when the stash was 6805 created. 6806 6807 ‘z B’ (‘magit-stash-branch-here’) 6808 Create and checkout a new branch from an existing stash. Use the 6809 current branch or ‘HEAD’ as the starting-point of the new branch. 6810 Then apply the stash, dropping it if it applies cleanly. 6811 6812 ‘z f’ (‘magit-stash-format-patch’) 6813 Create a patch from STASH. 6814 6815 ‘k’ (‘magit-stash-clear’) 6816 Remove all stashes saved in REF’s reflog by deleting REF. 6817 6818 ‘z l’ (‘magit-stash-list’) 6819 List all stashes in a buffer. 6820 6821 -- User Option: magit-stashes-margin 6822 This option specifies whether the margin is initially shown in 6823 stashes buffers and how it is formatted. 6824 6825 The value has the form ‘(INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH)’. 6826 6827 • If INIT is non-nil, then the margin is shown initially. 6828 • STYLE controls how to format the author or committer date. It 6829 can be one of ‘age’ (to show the age of the commit), 6830 ‘age-abbreviated’ (to abbreviate the time unit to a 6831 character), or a string (suitable for ‘format-time-string’) to 6832 show the actual date. Option 6833 ‘magit-log-margin-show-committer-date’ controls which date is 6834 being displayed. 6835 • WIDTH controls the width of the margin. This exists for 6836 forward compatibility and currently the value should not be 6837 changed. 6838 • AUTHOR controls whether the name of the author is also shown 6839 by default. 6840 • AUTHOR-WIDTH has to be an integer. When the name of the 6841 author is shown, then this specifies how much space is used to 6842 do so. 6843 6844 6845 File: magit.info, Node: Transferring, Next: Miscellaneous, Prev: Manipulating, Up: Top 6846 6847 7 Transferring 6848 ************** 6849 6850 * Menu: 6851 6852 * Remotes:: 6853 * Fetching:: 6854 * Pulling:: 6855 * Pushing:: 6856 * Plain Patches:: 6857 * Maildir Patches:: 6858 6859 6860 File: magit.info, Node: Remotes, Next: Fetching, Up: Transferring 6861 6862 7.1 Remotes 6863 =========== 6864 6865 * Menu: 6866 6867 * Remote Commands:: 6868 * Remote Git Variables:: 6869 6870 6871 File: magit.info, Node: Remote Commands, Next: Remote Git Variables, Up: Remotes 6872 6873 7.1.1 Remote Commands 6874 --------------------- 6875 6876 The transient prefix command ‘magit-remote’ is used to add remotes and 6877 to make changes to existing remotes. This command only deals with 6878 remotes themselves, not with branches or the transfer of commits. Those 6879 features are available from separate transient commands. 6880 6881 Also see *note (gitman)git-remote::. 6882 6883 ‘M’ (‘magit-remote’) 6884 This transient prefix command binds the following suffix commands 6885 and displays them in a temporary buffer until a suffix is invoked. 6886 6887 By default it also binds and displays the values of some 6888 remote-related Git variables and allows changing their values. 6889 6890 -- User Option: magit-remote-direct-configure 6891 This option controls whether remote-related Git variables are 6892 accessible directly from the transient ‘magit-remote’. 6893 6894 If ‘t’ (the default) and a local branch is checked out, then 6895 ‘magit-remote’ features the variables for the upstream remote of 6896 that branch, or if ‘HEAD’ is detached, for ‘origin’, provided that 6897 exists. 6898 6899 If ‘nil’, then ‘magit-remote-configure’ has to be used to do so. 6900 6901 ‘M C’ (‘magit-remote-configure’) 6902 This transient prefix command binds commands that set the value of 6903 remote-related variables and displays them in a temporary buffer 6904 until the transient is exited. 6905 6906 With a prefix argument, this command always prompts for a remote. 6907 6908 Without a prefix argument this depends on whether it was invoked as 6909 a suffix of ‘magit-remote’ and on the 6910 ‘magit-remote-direct-configure’ option. If ‘magit-remote’ already 6911 displays the variables for the upstream, then it does not make 6912 sense to invoke another transient that displays them for the same 6913 remote. In that case this command prompts for a remote. 6914 6915 The variables are described in *note Remote Git Variables::. 6916 6917 ‘M a’ (‘magit-remote-add’) 6918 This command add a remote and fetches it. The remote name and url 6919 are read in the minibuffer. 6920 6921 ‘M r’ (‘magit-remote-rename’) 6922 This command renames a remote. Both the old and the new names are 6923 read in the minibuffer. 6924 6925 ‘M u’ (‘magit-remote-set-url’) 6926 This command changes the url of a remote. Both the remote and the 6927 new url are read in the minibuffer. 6928 6929 ‘M k’ (‘magit-remote-remove’) 6930 This command deletes a remote, read in the minibuffer. 6931 6932 ‘M p’ (‘magit-remote-prune’) 6933 This command removes stale remote-tracking branches for a remote 6934 read in the minibuffer. 6935 6936 ‘M P’ (‘magit-remote-prune-refspecs’) 6937 This command removes stale refspecs for a remote read in the 6938 minibuffer. 6939 6940 A refspec is stale if there no longer exists at least one branch on 6941 the remote that would be fetched due to that refspec. A stale 6942 refspec is problematic because its existence causes Git to refuse 6943 to fetch according to the remaining non-stale refspecs. 6944 6945 If only stale refspecs remain, then this command offers to either 6946 delete the remote or to replace the stale refspecs with the default 6947 refspec ("+refs/heads/*:refs/remotes/REMOTE/*"). 6948 6949 This command also removes the remote-tracking branches that were 6950 created due to the now stale refspecs. Other stale branches are 6951 not removed. 6952 6953 -- User Option: magit-remote-add-set-remote.pushDefault 6954 This option controls whether the user is asked whether they want to 6955 set ‘remote.pushDefault’ after adding a remote. 6956 6957 If ‘ask’, then users is always ask. If ‘ask-if-unset’, then the 6958 user is only if the variable isn’t set already. If ‘nil’, then the 6959 user isn’t asked and the variable isn’t set. If the value is a 6960 string, then the variable is set without the user being asked, 6961 provided that the name of the added remote is equal to that string 6962 and the variable isn’t already set. 6963 6964 6965 File: magit.info, Node: Remote Git Variables, Prev: Remote Commands, Up: Remotes 6966 6967 7.1.2 Remote Git Variables 6968 -------------------------- 6969 6970 These variables can be set from the transient prefix command 6971 ‘magit-remote-configure’. By default they can also be set from 6972 ‘magit-remote’. See *note Remote Commands::. 6973 6974 -- Variable: remote.NAME.url 6975 This variable specifies the url of the remote named NAME. It can 6976 have multiple values. 6977 6978 -- Variable: remote.NAME.fetch 6979 The refspec used when fetching from the remote named NAME. It can 6980 have multiple values. 6981 6982 -- Variable: remote.NAME.pushurl 6983 This variable specifies the url used for pushing to the remote 6984 named NAME. If it is not specified, then ‘remote.NAME.url’ is used 6985 instead. It can have multiple values. 6986 6987 -- Variable: remote.NAME.push 6988 The refspec used when pushing to the remote named NAME. It can 6989 have multiple values. 6990 6991 -- Variable: remote.NAME.tagOpts 6992 This variable specifies what tags are fetched by default. If the 6993 value is ‘--no-tags’ then no tags are fetched. If the value is 6994 ‘--tags’, then all tags are fetched. If this variable has no 6995 value, then only tags are fetched that are reachable from fetched 6996 branches. 6997 6998 6999 File: magit.info, Node: Fetching, Next: Pulling, Prev: Remotes, Up: Transferring 7000 7001 7.2 Fetching 7002 ============ 7003 7004 Also see *note (gitman)git-fetch::. For information about the upstream 7005 and the push-remote, see *note The Two Remotes::. 7006 7007 ‘f’ (‘magit-fetch’) 7008 This transient prefix command binds the following suffix commands 7009 along with the appropriate infix arguments and displays them in a 7010 temporary buffer until a suffix is invoked. 7011 7012 ‘f p’ (‘magit-fetch-from-pushremote’) 7013 This command fetches from the current push-remote. 7014 7015 With a prefix argument or when the push-remote is either not 7016 configured or unusable, then let the user first configure the 7017 push-remote. 7018 7019 ‘f u’ (‘magit-fetch-from-upstream’) 7020 This command fetch from the upstream of the current branch. 7021 7022 If the upstream is configured for the current branch and names an 7023 existing remote, then use that. Otherwise try to use another 7024 remote: If only a single remote is configured, then use that. 7025 Otherwise if a remote named "origin" exists, then use that. 7026 7027 If no remote can be determined, then this command is not available 7028 from the ‘magit-fetch’ transient prefix and invoking it directly 7029 results in an error. 7030 7031 ‘f e’ (‘magit-fetch-other’) 7032 This command fetch from a repository read from the minibuffer. 7033 7034 ‘f o’ (‘magit-fetch-branch’) 7035 This command fetches a branch from a remote, both of which are read 7036 from the minibuffer. 7037 7038 ‘f r’ (‘magit-fetch-refspec’) 7039 This command fetches from a remote using an explicit refspec, both 7040 of which are read from the minibuffer. 7041 7042 ‘f a’ (‘magit-fetch-all’) 7043 This command fetches from all remotes. 7044 7045 ‘f m’ (‘magit-fetch-modules’) 7046 This command fetches all submodules. With a prefix argument, it 7047 acts as a transient prefix command, allowing the caller to set 7048 options. 7049 7050 -- User Option: magit-pull-or-fetch 7051 By default fetch and pull commands are available from separate 7052 transient prefix command. Setting this to ‘t’ adds some (but not 7053 all) of the above suffix commands to the ‘magit-pull’ transient. 7054 7055 If you do that, then you might also want to change the key binding 7056 for these prefix commands, e.g.: 7057 7058 (setq magit-pull-or-fetch t) 7059 (define-key magit-mode-map "f" 'magit-pull) ; was magit-fetch 7060 (define-key magit-mode-map "F" nil) ; was magit-pull 7061 7062 7063 File: magit.info, Node: Pulling, Next: Pushing, Prev: Fetching, Up: Transferring 7064 7065 7.3 Pulling 7066 =========== 7067 7068 Also see *note (gitman)git-pull::. For information about the upstream 7069 and the push-remote, see *note The Two Remotes::. 7070 7071 ‘F’ (‘magit-pull’) 7072 This transient prefix command binds the following suffix commands 7073 and displays them in a temporary buffer until a suffix is invoked. 7074 7075 ‘F p’ (‘magit-pull-from-pushremote’) 7076 This command pulls from the push-remote of the current branch. 7077 7078 With a prefix argument or when the push-remote is either not 7079 configured or unusable, then let the user first configure the 7080 push-remote. 7081 7082 ‘F u’ (‘magit-pull-from-upstream’) 7083 This command pulls from the upstream of the current branch. 7084 7085 With a prefix argument or when the upstream is either not 7086 configured or unusable, then let the user first configure the 7087 upstream. 7088 7089 ‘F e’ (‘magit-pull-branch’) 7090 This command pulls from a branch read in the minibuffer. 7091 7092 7093 File: magit.info, Node: Pushing, Next: Plain Patches, Prev: Pulling, Up: Transferring 7094 7095 7.4 Pushing 7096 =========== 7097 7098 Also see *note (gitman)git-push::. For information about the upstream 7099 and the push-remote, see *note The Two Remotes::. 7100 7101 ‘P’ (‘magit-push’) 7102 This transient prefix command binds the following suffix commands 7103 along with the appropriate infix arguments and displays them in a 7104 temporary buffer until a suffix is invoked. 7105 7106 ‘P p’ (‘magit-push-current-to-pushremote’) 7107 This command pushes the current branch to its push-remote. 7108 7109 With a prefix argument or when the push-remote is either not 7110 configured or unusable, then let the user first configure the 7111 push-remote. 7112 7113 ‘P u’ (‘magit-push-current-to-upstream’) 7114 This command pushes the current branch to its upstream branch. 7115 7116 With a prefix argument or when the upstream is either not 7117 configured or unusable, then let the user first configure the 7118 upstream. 7119 7120 ‘P e’ (‘magit-push-current’) 7121 This command pushes the current branch to a branch read in the 7122 minibuffer. 7123 7124 ‘P o’ (‘magit-push-other’) 7125 This command pushes an arbitrary branch or commit somewhere. Both 7126 the source and the target are read in the minibuffer. 7127 7128 ‘P r’ (‘magit-push-refspecs’) 7129 This command pushes one or multiple refspecs to a remote, both of 7130 which are read in the minibuffer. 7131 7132 To use multiple refspecs, separate them with commas. Completion is 7133 only available for the part before the colon, or when no colon is 7134 used. 7135 7136 ‘P m’ (‘magit-push-matching’) 7137 This command pushes all matching branches to another repository. 7138 7139 If only one remote exists, then push to that. Otherwise prompt for 7140 a remote, offering the remote configured for the current branch as 7141 default. 7142 7143 ‘P t’ (‘magit-push-tags’) 7144 This command pushes all tags to another repository. 7145 7146 If only one remote exists, then push to that. Otherwise prompt for 7147 a remote, offering the remote configured for the current branch as 7148 default. 7149 7150 ‘P T’ (‘magit-push-tag’) 7151 This command pushes a tag to another repository. 7152 7153 One of the infix arguments, ‘--force-with-lease’, deserves a word of 7154 caution. It is passed without a value, which means "permit a force push 7155 as long as the remote-tracking branches match their counterparts on the 7156 remote end". If you’ve set up a tool to do automatic fetches (Magit 7157 itself does not provide such functionality), using ‘--force-with-lease’ 7158 can be dangerous because you don’t actually control or know the state of 7159 the remote-tracking refs. In that case, you should consider setting 7160 ‘push.useForceIfIncludes’ to ‘true’ (available since Git 2.30). 7161 7162 Two more push commands exist, which by default are not available from 7163 the push transient. See their doc-strings for instructions on how to 7164 add them to the transient. 7165 7166 -- Command: magit-push-implicitly args 7167 This command pushes somewhere without using an explicit refspec. 7168 7169 This command simply runs ‘git push -v [ARGS]’. ARGS are the infix 7170 arguments. No explicit refspec arguments are used. Instead the 7171 behavior depends on at least these Git variables: ‘push.default’, 7172 ‘remote.pushDefault’, ‘branch.<branch>.pushRemote’, 7173 ‘branch.<branch>.remote’, ‘branch.<branch>.merge’, and 7174 ‘remote.<remote>.push’. 7175 7176 If you add this suffix to a transient prefix without explicitly 7177 specifying the description, then an attempt is made to predict what 7178 this command will do. For example: 7179 7180 (transient-insert-suffix 'magit-push \"p\" 7181 '(\"i\" magit-push-implicitly))" 7182 7183 -- Command: magit-push-to-remote remote args 7184 This command pushes to the remote REMOTE without using an explicit 7185 refspec. The remote is read in the minibuffer. 7186 7187 This command simply runs ‘git push -v [ARGS] REMOTE’. ARGS are the 7188 infix arguments. No refspec arguments are used. Instead the 7189 behavior depends on at least these Git variables: ‘push.default’, 7190 ‘remote.pushDefault’, ‘branch.<branch>.pushRemote’, 7191 ‘branch.<branch>.remote’, ‘branch.<branch>.merge’, and 7192 ‘remote.<remote>.push’. 7193 7194 7195 File: magit.info, Node: Plain Patches, Next: Maildir Patches, Prev: Pushing, Up: Transferring 7196 7197 7.5 Plain Patches 7198 ================= 7199 7200 ‘W’ (‘magit-patch’) 7201 This transient prefix command binds the following suffix commands 7202 along with the appropriate infix arguments and displays them in a 7203 temporary buffer until a suffix is invoked. 7204 7205 ‘W c’ (‘magit-patch-create’) 7206 This command creates patches for a set commits. If the region 7207 marks several commits, then it creates patches for all of them. 7208 Otherwise it functions as a transient prefix command, which 7209 features several infix arguments and binds itself as a suffix 7210 command. When this command is invoked as a suffix of itself, then 7211 it creates a patch using the specified infix arguments. 7212 7213 ‘w a’ (‘magit-patch-apply’) 7214 This command applies a patch. This is a transient prefix command, 7215 which features several infix arguments and binds itself as a suffix 7216 command. When this command is invoked as a suffix of itself, then 7217 it applies a patch using the specified infix arguments. 7218 7219 ‘W s’ (‘magit-patch-save’) 7220 This command creates a patch from the current diff. 7221 7222 Inside ‘magit-diff-mode’ or ‘magit-revision-mode’ buffers, ‘C-x 7223 C-w’ is also bound to this command. 7224 7225 It is also possible to save a plain patch file by using ‘C-x C-w’ 7226 inside a ‘magit-diff-mode’ or ‘magit-revision-mode’ buffer. 7227 7228 7229 File: magit.info, Node: Maildir Patches, Prev: Plain Patches, Up: Transferring 7230 7231 7.6 Maildir Patches 7232 =================== 7233 7234 Also see *note (gitman)git-am::. and *note (gitman)git-apply::. 7235 7236 ‘w’ (‘magit-am’) 7237 This transient prefix command binds the following suffix commands 7238 along with the appropriate infix arguments and displays them in a 7239 temporary buffer until a suffix is invoked. 7240 7241 ‘w w’ (‘magit-am-apply-patches’) 7242 This command applies one or more patches. If the region marks 7243 files, then those are applied as patches. Otherwise this command 7244 reads a file-name in the minibuffer, defaulting to the file at 7245 point. 7246 7247 ‘w m’ (‘magit-am-apply-maildir’) 7248 This command applies patches from a maildir. 7249 7250 ‘w a’ (‘magit-patch-apply’) 7251 This command applies a plain patch. For a longer description see 7252 *note Plain Patches::. This command is only available from the 7253 ‘magit-am’ transient for historic reasons. 7254 7255 When an "am" operation is in progress, then the transient instead 7256 features the following suffix commands. 7257 7258 ‘w w’ (‘magit-am-continue’) 7259 This command resumes the current patch applying sequence. 7260 7261 ‘w s’ (‘magit-am-skip’) 7262 This command skips the stopped at patch during a patch applying 7263 sequence. 7264 7265 ‘w a’ (‘magit-am-abort’) 7266 This command aborts the current patch applying sequence. This 7267 discards all changes made since the sequence started. 7268 7269 7270 File: magit.info, Node: Miscellaneous, Next: Customizing, Prev: Transferring, Up: Top 7271 7272 8 Miscellaneous 7273 *************** 7274 7275 * Menu: 7276 7277 * Tagging:: 7278 * Notes:: 7279 * Submodules:: 7280 * Subtree:: 7281 * Worktree:: 7282 * Sparse checkouts:: 7283 * Bundle:: 7284 * Common Commands:: 7285 * Wip Modes:: 7286 * Commands for Buffers Visiting Files:: 7287 * Minor Mode for Buffers Visiting Blobs:: 7288 7289 7290 File: magit.info, Node: Tagging, Next: Notes, Up: Miscellaneous 7291 7292 8.1 Tagging 7293 =========== 7294 7295 Also see *note (gitman)git-tag::. 7296 7297 ‘t’ (‘magit-tag’) 7298 This transient prefix command binds the following suffix commands 7299 along with the appropriate infix arguments and displays them in a 7300 temporary buffer until a suffix is invoked. 7301 7302 ‘t t’ (‘magit-tag-create’) 7303 This command creates a new tag with the given NAME at REV. With a 7304 prefix argument it creates an annotated tag. 7305 7306 ‘t r’ (‘magit-tag-release’) 7307 This commands creates a release tag. It assumes that release tags 7308 match ‘magit-release-tag-regexp’. 7309 7310 First it prompts for the name of the new tag using the highest 7311 existing tag as initial input and leaving it to the user to 7312 increment the desired part of the version string. If you use 7313 unconventional release tags or version numbers (e.g., 7314 ‘v1.2.3-custom.1’), you can set the ‘magit-release-tag-regexp’ and 7315 ‘magit-tag-version-regexp-alist’ variables. 7316 7317 If ‘--annotate’ is enabled then it prompts for the message of the 7318 new tag. The proposed tag message is based on the message of the 7319 highest tag, provided that that contains the corresponding version 7320 string and substituting the new version string for that. Otherwise 7321 it proposes something like "Foo-Bar 1.2.3", given, for example, a 7322 TAG "v1.2.3" and a repository located at something like 7323 "/path/to/foo-bar". 7324 7325 ‘t k’ (‘magit-tag-delete’) 7326 This command deletes one or more tags. If the region marks 7327 multiple tags (and nothing else), then it offers to delete those. 7328 Otherwise, it prompts for a single tag to be deleted, defaulting to 7329 the tag at point. 7330 7331 ‘t p’ (‘magit-tag-prune’) 7332 This command offers to delete tags missing locally from REMOTE, and 7333 vice versa. 7334 7335 7336 File: magit.info, Node: Notes, Next: Submodules, Prev: Tagging, Up: Miscellaneous 7337 7338 8.2 Notes 7339 ========= 7340 7341 Also see *note (gitman)git-notes::. 7342 7343 ‘T’ (‘magit-notes’) 7344 This transient prefix command binds the following suffix commands 7345 along with the appropriate infix arguments and displays them in a 7346 temporary buffer until a suffix is invoked. 7347 7348 ‘T T’ (‘magit-notes-edit’) 7349 Edit the note attached to a commit, defaulting to the commit at 7350 point. 7351 7352 By default use the value of Git variable ‘core.notesRef’ or 7353 "refs/notes/commits" if that is undefined. 7354 7355 ‘T r’ (‘magit-notes-remove’) 7356 Remove the note attached to a commit, defaulting to the commit at 7357 point. 7358 7359 By default use the value of Git variable ‘core.notesRef’ or 7360 "refs/notes/commits" if that is undefined. 7361 7362 ‘T p’ (‘magit-notes-prune’) 7363 Remove notes about unreachable commits. 7364 7365 It is possible to merge one note ref into another. That may result 7366 in conflicts which have to resolved in the temporary worktree 7367 ".git/NOTES_MERGE_WORKTREE". 7368 7369 ‘T m’ (‘magit-notes-merge’) 7370 Merge the notes of a ref read from the user into the current notes 7371 ref. The current notes ref is the value of Git variable 7372 ‘core.notesRef’ or "refs/notes/commits" if that is undefined. 7373 7374 When a notes merge is in progress then the transient features the 7375 following suffix commands, instead of those listed above. 7376 7377 ‘T c’ (‘magit-notes-merge-commit’) 7378 Commit the current notes ref merge, after manually resolving 7379 conflicts. 7380 7381 ‘T a’ (‘magit-notes-merge-abort’) 7382 Abort the current notes ref merge. 7383 7384 The following variables control what notes reference ‘magit-notes-*’, 7385 ‘git notes’ and ‘git show’ act on and display. Both the local and 7386 global values are displayed and can be modified. 7387 7388 -- Variable: core.notesRef 7389 This variable specifies the notes ref that is displayed by default 7390 and which commands act on by default. 7391 7392 -- Variable: notes.displayRef 7393 This variable specifies additional notes ref to be displayed in 7394 addition to the ref specified by ‘core.notesRef’. It can have 7395 multiple values and may end with ‘*’ to display all refs in the 7396 ‘refs/notes/’ namespace (or ‘**’ if some names contain slashes). 7397 7398 7399 File: magit.info, Node: Submodules, Next: Subtree, Prev: Notes, Up: Miscellaneous 7400 7401 8.3 Submodules 7402 ============== 7403 7404 Also see *note (gitman)git-submodule::. 7405 7406 * Menu: 7407 7408 * Listing Submodules:: 7409 * Submodule Transient:: 7410 7411 7412 File: magit.info, Node: Listing Submodules, Next: Submodule Transient, Up: Submodules 7413 7414 8.3.1 Listing Submodules 7415 ------------------------ 7416 7417 The command ‘magit-list-submodules’ displays a list of the current 7418 repository’s submodules in a separate buffer. It’s also possible to 7419 display information about submodules directly in the status buffer of 7420 the super-repository by adding ‘magit-insert-modules’ to the hook 7421 ‘magit-status-sections-hook’ as described in *note Status Module 7422 Sections::. 7423 7424 -- Command: magit-list-submodules 7425 This command displays a list of the current repository’s populated 7426 submodules in a separate buffer. 7427 7428 It can be invoked by pressing ‘RET’ on the section titled 7429 "Modules". 7430 7431 -- User Option: magit-submodule-list-columns 7432 This option controls what columns are displayed by the command 7433 ‘magit-list-submodules’ and how they are displayed. 7434 7435 Each element has the form ‘(HEADER WIDTH FORMAT PROPS)’. 7436 7437 HEADER is the string displayed in the header. WIDTH is the width 7438 of the column. FORMAT is a function that is called with one 7439 argument, the repository identification (usually its basename), and 7440 with ‘default-directory’ bound to the toplevel of its working tree. 7441 It has to return a string to be inserted or nil. PROPS is an alist 7442 that supports the keys ‘:right-align’, ‘:pad-right’ and ‘:sort’. 7443 7444 The ‘:sort’ function has a weird interface described in the 7445 docstring of ‘tabulated-list--get-sort’. Alternatively ‘<’ and 7446 ‘magit-repolist-version<’ can be used as those functions are 7447 automatically replaced with functions that satisfy the interface. 7448 Set ‘:sort’ to ‘nil’ to inhibit sorting; if unspecified, then the 7449 column is sortable using the default sorter. 7450 7451 You may wish to display a range of numeric columns using just one 7452 character per column and without any padding between columns, in 7453 which case you should use an appropriate HEADER, set WIDTH to 1, 7454 and set ‘:pad-right’ to 9. ‘+’ is substituted for numbers higher 7455 than 9. 7456 7457 7458 File: magit.info, Node: Submodule Transient, Prev: Listing Submodules, Up: Submodules 7459 7460 8.3.2 Submodule Transient 7461 ------------------------- 7462 7463 ‘o’ (‘magit-submodule’) 7464 This transient prefix command binds the following suffix commands 7465 along with the appropriate infix arguments and displays them in a 7466 temporary buffer until a suffix is invoked. 7467 7468 Some of the below commands default to act on the modules that are 7469 selected using the region. For brevity their description talk about 7470 "the selected modules", but if no modules are selected, then they act on 7471 the current module instead, or if point isn’t on a module, then the read 7472 a single module to act on. With a prefix argument these commands ignore 7473 the selection and the current module and instead act on all suitable 7474 modules. 7475 7476 ‘o a’ (‘magit-submodule-add’) 7477 This commands adds the repository at URL as a module. Optional 7478 PATH is the path to the module relative to the root of the 7479 super-project. If it is nil then the path is determined based on 7480 URL. 7481 7482 ‘o r’ (‘magit-submodule-register’) 7483 This command registers the selected modules by copying their urls 7484 from ".gitmodules" to "$GIT_DIR/config". These values can then be 7485 edited before running ‘magit-submodule-populate’. If you don’t 7486 need to edit any urls, then use the latter directly. 7487 7488 ‘o p’ (‘magit-submodule-populate’) 7489 This command creates the working directory or directories of the 7490 selected modules, checking out the recorded commits. 7491 7492 ‘o u’ (‘magit-submodule-update’) 7493 This command updates the selected modules checking out the recorded 7494 commits. 7495 7496 ‘o s’ (‘magit-submodule-synchronize’) 7497 This command synchronizes the urls of the selected modules, copying 7498 the values from ".gitmodules" to the ".git/config" of the 7499 super-project as well those of the modules. 7500 7501 ‘o d’ (‘magit-submodule-unpopulate’) 7502 This command removes the working directory of the selected modules. 7503 7504 ‘o l’ (‘magit-list-submodules’) 7505 This command displays a list of the current repository’s modules. 7506 7507 ‘o f’ (‘magit-fetch-modules’) 7508 This command fetches all populated modules. With a prefix 7509 argument, it acts as a transient prefix command, allowing the 7510 caller to set options. 7511 7512 Also fetch the super-repository, because ‘git fetch’ does not 7513 support not doing that. 7514 7515 7516 File: magit.info, Node: Subtree, Next: Worktree, Prev: Submodules, Up: Miscellaneous 7517 7518 8.4 Subtree 7519 =========== 7520 7521 Also see *note (gitman)git-subtree::. 7522 7523 ‘O’ (‘magit-subtree’) 7524 This transient prefix command binds the two sub-transients; one for 7525 importing a subtree and one for exporting a subtree. 7526 7527 ‘O i’ (‘magit-subtree-import’) 7528 This transient prefix command binds the following suffix commands 7529 along with the appropriate infix arguments and displays them in a 7530 temporary buffer until a suffix is invoked. 7531 7532 The suffixes of this command import subtrees. 7533 7534 If the ‘--prefix’ argument is set, then the suffix commands use 7535 that prefix without prompting the user. If it is unset, then they 7536 read the prefix in the minibuffer. 7537 7538 ‘O i a’ (‘magit-subtree-add’) 7539 This command adds COMMIT from REPOSITORY as a new subtree at 7540 PREFIX. 7541 7542 ‘O i c’ (‘magit-subtree-add-commit’) 7543 This command add COMMIT as a new subtree at PREFIX. 7544 7545 ‘O i m’ (‘magit-subtree-merge’) 7546 This command merges COMMIT into the PREFIX subtree. 7547 7548 ‘O i f’ (‘magit-subtree-pull’) 7549 This command pulls COMMIT from REPOSITORY into the PREFIX subtree. 7550 7551 ‘O e’ (‘magit-subtree-export’) 7552 This transient prefix command binds the following suffix commands 7553 along with the appropriate infix arguments and displays them in a 7554 temporary buffer until a suffix is invoked. 7555 7556 The suffixes of this command export subtrees. 7557 7558 If the ‘--prefix’ argument is set, then the suffix commands use 7559 that prefix without prompting the user. If it is unset, then they 7560 read the prefix in the minibuffer. 7561 7562 ‘O e p’ (‘magit-subtree-push’) 7563 This command extract the history of the subtree PREFIX and pushes 7564 it to REF on REPOSITORY. 7565 7566 ‘O e s’ (‘magit-subtree-split’) 7567 This command extracts the history of the subtree PREFIX. 7568 7569 7570 File: magit.info, Node: Worktree, Next: Sparse checkouts, Prev: Subtree, Up: Miscellaneous 7571 7572 8.5 Worktree 7573 ============ 7574 7575 Also see *note (gitman)git-worktree::. 7576 7577 ‘Z’ (‘magit-worktree’) 7578 This transient prefix command binds the following suffix commands 7579 and displays them in a temporary buffer until a suffix is invoked. 7580 7581 ‘Z b’ (‘magit-worktree-checkout’) 7582 Checkout BRANCH in a new worktree at PATH. 7583 7584 ‘Z c’ (‘magit-worktree-branch’) 7585 Create a new BRANCH and check it out in a new worktree at PATH. 7586 7587 ‘Z m’ (‘magit-worktree-move’) 7588 Move an existing worktree to a new PATH. 7589 7590 ‘Z k’ (‘magit-worktree-delete’) 7591 Delete a worktree, defaulting to the worktree at point. The 7592 primary worktree cannot be deleted. 7593 7594 ‘Z g’ (‘magit-worktree-status’) 7595 Show the status for the worktree at point. 7596 7597 If there is no worktree at point, then read one in the minibuffer. 7598 If the worktree at point is the one whose status is already being 7599 displayed in the current buffer, then show it in Dired instead. 7600 7601 7602 File: magit.info, Node: Sparse checkouts, Next: Bundle, Prev: Worktree, Up: Miscellaneous 7603 7604 8.6 Sparse checkouts 7605 ==================== 7606 7607 Sparse checkouts provide a way to restrict the working tree to a subset 7608 of directories. See *note (gitman)git-sparse-checkout::. 7609 7610 *Warning*: Git introduced the ‘git sparse-checkout’ command in 7611 version 2.25 and still advertises it as experimental and subject to 7612 change. Magit’s interface should be considered the same. In 7613 particular, if Git introduces a backward incompatible change, Magit’s 7614 sparse checkout functionality may be updated in a way that requires a 7615 more recent Git version. 7616 7617 ‘>’ (‘magit-sparse-checkout’) 7618 This transient prefix command binds the following suffix commands 7619 and displays them in a temporary buffer until a suffix is invoked. 7620 7621 ‘> e’ (‘magit-sparse-checkout-enable’) 7622 This command initializes a sparse checkout that includes only the 7623 files in the top-level directory. 7624 7625 Note that ‘magit-sparse-checkout-set’ and 7626 ‘magit-sparse-checkout-add’ automatically initialize a sparse 7627 checkout if necessary. However, you may want to call 7628 ‘magit-sparse-checkout-enable’ explicitly to re-initialize a sparse 7629 checkout after calling ‘magit-sparse-checkout-disable’, to pass 7630 additional arguments to ‘git sparse-checkout init’, or to execute 7631 the initialization asynchronously. 7632 7633 ‘> s’ (‘magit-sparse-checkout-set’) 7634 This command takes a list of directories and configures the sparse 7635 checkout to include only files in those subdirectories. Any 7636 previously included directories are excluded unless they are in the 7637 provided list of directories. 7638 7639 ‘> a’ (‘magit-sparse-checkout-add’) 7640 This command is like ‘magit-sparse-checkout-set’, but instead adds 7641 the specified list of directories to the set of directories that is 7642 already included in the sparse checkout. 7643 7644 ‘> r’ (‘magit-sparse-checkout-reapply’) 7645 This command applies the currently configured sparse checkout 7646 patterns to the working tree. This is useful to call if excluded 7647 files have been checked out after operations such as merging or 7648 rebasing. 7649 7650 ‘> d’ (‘magit-sparse-checkout-disable’) 7651 This command restores the full checkout. To return to the previous 7652 sparse checkout, call ‘magit-sparse-checkout-enable’. 7653 7654 A sparse checkout can also be initiated when cloning a repository by 7655 using the ‘magit-clone-sparse’ command in the ‘magit-clone’ transient 7656 (see *note Cloning Repository::). 7657 7658 If you want the status buffer to indicate when a sparse checkout is 7659 enabled, add the function ‘magit-sparse-checkout-insert-header’ to 7660 ‘magit-status-headers-hook’. 7661 7662 7663 File: magit.info, Node: Bundle, Next: Common Commands, Prev: Sparse checkouts, Up: Miscellaneous 7664 7665 8.7 Bundle 7666 ========== 7667 7668 Also see *note (gitman)git-bundle::. 7669 7670 -- Command: magit-bundle 7671 This transient prefix command binds several suffix commands for 7672 running ‘git bundle’ subcommands and displays them in a temporary 7673 buffer until a suffix is invoked. 7674 7675 7676 File: magit.info, Node: Common Commands, Next: Wip Modes, Prev: Bundle, Up: Miscellaneous 7677 7678 8.8 Common Commands 7679 =================== 7680 7681 -- Command: magit-switch-to-repository-buffer 7682 -- Command: magit-switch-to-repository-buffer-other-window 7683 -- Command: magit-switch-to-repository-buffer-other-frame 7684 -- Command: magit-display-repository-buffer 7685 These commands read any existing Magit buffer that belongs to the 7686 current repository from the user and then switch to the selected 7687 buffer (without refreshing it). 7688 7689 The last variant uses ‘magit-display-buffer’ to do so and thus 7690 respects ‘magit-display-buffer-function’. 7691 7692 These are some of the commands that can be used in all buffers whose 7693 major-modes derive from ‘magit-mode’. There are other common commands 7694 beside the ones below, but these didn’t fit well anywhere else. 7695 7696 ‘C-w’ (‘magit-copy-section-value’) 7697 This command saves the value of the current section to the 7698 ‘kill-ring’, and, provided that the current section is a commit, 7699 branch, or tag section, it also pushes the (referenced) revision to 7700 the ‘magit-revision-stack’. 7701 7702 When the current section is a branch or a tag, and a prefix 7703 argument is used, then it saves the revision at its tip to the 7704 ‘kill-ring’ instead of the reference name. 7705 7706 When the region is active, this command saves that to the 7707 ‘kill-ring’, like ‘kill-ring-save’ would, instead of behaving as 7708 described above. If a prefix argument is used and the region is 7709 within a hunk, then it strips the diff marker column and keeps only 7710 either the added or removed lines, depending on the sign of the 7711 prefix argument. 7712 7713 ‘M-w’ (‘magit-copy-buffer-revision’) 7714 This command saves the revision being displayed in the current 7715 buffer to the ‘kill-ring’ and also pushes it to the 7716 ‘magit-revision-stack’. It is mainly intended for use in 7717 ‘magit-revision-mode’ buffers, the only buffers where it is always 7718 unambiguous exactly which revision should be saved. 7719 7720 Most other Magit buffers usually show more than one revision, in 7721 some way or another, so this command has to select one of them, and 7722 that choice might not always be the one you think would have been 7723 the best pick. 7724 7725 Outside of Magit ‘M-w’ and ‘C-w’ are usually bound to 7726 ‘kill-ring-save’ and ‘kill-region’, and these commands would also be 7727 useful in Magit buffers. Therefore when the region is active, then both 7728 of these commands behave like ‘kill-ring-save’ instead of as described 7729 above. 7730 7731 7732 File: magit.info, Node: Wip Modes, Next: Commands for Buffers Visiting Files, Prev: Common Commands, Up: Miscellaneous 7733 7734 8.9 Wip Modes 7735 ============= 7736 7737 Git keeps *committed* changes around long enough for users to recover 7738 changes they have accidentally deleted. It does so by not garbage 7739 collecting any committed but no longer referenced objects for a certain 7740 period of time, by default 30 days. 7741 7742 But Git does *not* keep track of *uncommitted* changes in the working 7743 tree and not even the index (the staging area). Because Magit makes it 7744 so convenient to modify uncommitted changes, it also makes it easy to 7745 shoot yourself in the foot in the process. 7746 7747 For that reason Magit provides a global mode that saves *tracked* 7748 files to work-in-progress references after or before certain actions. 7749 (At present untracked files are never saved and for technical reasons 7750 nothing is saved before the first commit has been created). 7751 7752 Two separate work-in-progress references are used to track the state 7753 of the index and of the working tree: ‘refs/wip/index/<branchref>’ and 7754 ‘refs/wip/wtree/<branchref>’, where ‘<branchref>’ is the full ref of the 7755 current branch, e.g., ‘refs/heads/master’. When the ‘HEAD’ is detached 7756 then ‘HEAD’ is used in place of ‘<branchref>’. 7757 7758 Checking out another branch (or detaching ‘HEAD’) causes the use of 7759 different wip refs for subsequent changes. 7760 7761 -- User Option: magit-wip-mode 7762 When this mode is enabled, then uncommitted changes are committed 7763 to dedicated work-in-progress refs whenever appropriate (i.e., when 7764 dataloss would be a possibility otherwise). 7765 7766 Setting this variable directly does not take effect; either use the 7767 Custom interface to do so or call the respective mode function. 7768 7769 For historic reasons this mode is implemented on top of four other 7770 ‘magit-wip-*’ modes, which can also be used individually, if you 7771 want finer control over when the wip refs are updated; but that is 7772 discouraged. See *note Legacy Wip Modes::. 7773 7774 To view the log for a branch and its wip refs use the commands 7775 ‘magit-wip-log’ and ‘magit-wip-log-current’. You should use ‘--graph’ 7776 when using these commands. 7777 7778 -- Command: magit-wip-log 7779 This command shows the log for a branch and its wip refs. With a 7780 negative prefix argument only the worktree wip ref is shown. 7781 7782 The absolute numeric value of the prefix argument controls how many 7783 "branches" of each wip ref are shown. This is only relevant if the 7784 value of ‘magit-wip-merge-branch’ is ‘nil’. 7785 7786 -- Command: magit-wip-log-current 7787 This command shows the log for the current branch and its wip refs. 7788 With a negative prefix argument only the worktree wip ref is shown. 7789 7790 The absolute numeric value of the prefix argument controls how many 7791 "branches" of each wip ref are shown. This is only relevant if the 7792 value of ‘magit-wip-merge-branch’ is ‘nil’. 7793 7794 ‘X w’ (‘magit-reset-worktree’) 7795 This command resets the working tree to some commit read from the 7796 user and defaulting to the commit at point, while keeping the 7797 ‘HEAD’ and index as-is. 7798 7799 This can be used to restore files to the state committed to a wip 7800 ref. Note that this will discard any unstaged changes that might 7801 have existed before invoking this command (but of course only after 7802 committing that to the working tree wip ref). 7803 7804 Note that even if you enable ‘magit-wip-mode’ this won’t give you 7805 perfect protection. The most likely scenario for losing changes despite 7806 the use of ‘magit-wip-mode’ is making a change outside Emacs and then 7807 destroying it also outside Emacs. In some such a scenario, Magit, being 7808 an Emacs package, didn’t get the opportunity to keep you from shooting 7809 yourself in the foot. 7810 7811 When you are unsure whether Magit did commit a change to the wip 7812 refs, then you can explicitly request that all changes to all tracked 7813 files are being committed. 7814 7815 ‘M-x magit-wip-commit’ 7816 This command commits all changes to all tracked files to the index 7817 and working tree work-in-progress refs. Like the modes described 7818 above, it does not commit untracked files, but it does check all 7819 tracked files for changes. Use this command when you suspect that 7820 the modes might have overlooked a change made outside Emacs/Magit. 7821 7822 -- User Option: magit-wip-namespace 7823 The namespace used for work-in-progress refs. It has to end with a 7824 slash. The wip refs are named ‘<namespace>index/<branchref>’ and 7825 ‘<namespace>wtree/<branchref>’. When snapshots are created while 7826 the ‘HEAD’ is detached then ‘HEAD’ is used in place of 7827 ‘<branchref>’. 7828 7829 -- User Option: magit-wip-mode-lighter 7830 Mode-line lighter for ‘magit-wip--mode’. 7831 7832 * Menu: 7833 7834 * Wip Graph:: 7835 * Legacy Wip Modes:: 7836 7837 7838 File: magit.info, Node: Wip Graph, Next: Legacy Wip Modes, Up: Wip Modes 7839 7840 8.9.1 Wip Graph 7841 --------------- 7842 7843 -- User Option: magit-wip-merge-branch 7844 This option controls whether the current branch is merged into the 7845 wip refs after a new commit was created on the branch. 7846 7847 If non-nil and the current branch has new commits, then it is 7848 merged into the wip ref before creating a new wip commit. This 7849 makes it easier to inspect wip history and the wip commits are 7850 never garbage collected. 7851 7852 If nil and the current branch has new commits, then the wip ref is 7853 reset to the tip of the branch before creating a new wip commit. 7854 With this setting wip commits are eventually garbage collected. 7855 7856 When ‘magit-wip-merge-branch’ is ‘t’, then the history looks like 7857 this: 7858 7859 *--*--*--*--*--* refs/wip/index/refs/heads/master 7860 / / / 7861 A-----B-----C refs/heads/master 7862 7863 When ‘magit-wip-merge-branch’ is ‘nil’, then creating a commit on the 7864 real branch and then making a change causes the wip refs to be recreated 7865 to fork from the new commit. But the old commits on the wip refs are 7866 not lost. They are still available from the reflog. To make it easier 7867 to see when the fork point of a wip ref was changed, an additional 7868 commit with the message "restart autosaving" is created on it (‘xxO’ 7869 commits below are such boundary commits). 7870 7871 Starting with 7872 7873 BI0---BI1 refs/wip/index/refs/heads/master 7874 / 7875 A---B refs/heads/master 7876 \ 7877 BW0---BW1 refs/wip/wtree/refs/heads/master 7878 7879 and committing the staged changes and editing and saving a file would 7880 result in 7881 7882 BI0---BI1 refs/wip/index/refs/heads/master 7883 / 7884 A---B---C refs/heads/master 7885 \ \ 7886 \ CW0---CW1 refs/wip/wtree/refs/heads/master 7887 \ 7888 BW0---BW1 refs/wip/wtree/refs/heads/master@{2} 7889 7890 The fork-point of the index wip ref is not changed until some change 7891 is being staged. Likewise just checking out a branch or creating a 7892 commit does not change the fork-point of the working tree wip ref. The 7893 fork-points are not adjusted until there actually is a change that 7894 should be committed to the respective wip ref. 7895 7896 7897 File: magit.info, Node: Legacy Wip Modes, Prev: Wip Graph, Up: Wip Modes 7898 7899 8.9.2 Legacy Wip Modes 7900 ---------------------- 7901 7902 It is recommended that you use the mode ‘magit-wip-mode’ (which see) and 7903 ignore the existence of the following modes, which are preserved for 7904 historic reasons. 7905 7906 Setting the following variables directly does not take effect; either 7907 use the Custom interface to do so or call the respective mode functions. 7908 7909 -- User Option: magit-wip-after-save-mode 7910 When this mode is enabled, then saving a buffer that visits a file 7911 tracked in a Git repository causes its current state to be 7912 committed to the working tree wip ref for the current branch. 7913 7914 -- User Option: magit-wip-after-apply-mode 7915 When this mode is enabled, then applying (i.e., staging, unstaging, 7916 discarding, reversing, and regularly applying) a change to a file 7917 tracked in a Git repository causes its current state to be 7918 committed to the index and/or working tree wip refs for the current 7919 branch. 7920 7921 If you only ever edit files using Emacs and only ever interact with 7922 Git using Magit, then the above two modes should be enough to protect 7923 each and every change from accidental loss. In practice nobody does 7924 that. Two additional modes exists that do commit to the wip refs before 7925 making changes that could cause the loss of earlier changes. 7926 7927 -- User Option: magit-wip-before-change-mode 7928 When this mode is enabled, then certain commands commit the 7929 existing changes to the files they are about to make changes to. 7930 7931 -- User Option: magit-wip-initial-backup-mode 7932 When this mode is enabled, then the current version of a file is 7933 committed to the worktree wip ref before the buffer visiting that 7934 file is saved for the first time since the buffer was created. 7935 7936 This backs up the same version of the file that ‘backup-buffer’ 7937 would save. While ‘backup-buffer’ uses a backup file, this mode 7938 uses the same worktree wip ref as used by the other Magit Wip 7939 modes. Like ‘backup-buffer’, it only does this once; unless you 7940 kill the buffer and visit the file again only one backup will be 7941 created per Emacs session. 7942 7943 This mode ignores the variables that affect ‘backup-buffer’ and can 7944 be used along-side that function, which is recommended because it 7945 only backs up files that are tracked in a Git repository. 7946 7947 -- User Option: magit-wip-after-save-local-mode-lighter 7948 Mode-line lighter for ‘magit-wip-after-save-local-mode’. 7949 7950 -- User Option: magit-wip-after-apply-mode-lighter 7951 Mode-line lighter for ‘magit-wip-after-apply-mode’. 7952 7953 -- User Option: magit-wip-before-change-mode-lighter 7954 Mode-line lighter for ‘magit-wip-before-change-mode’. 7955 7956 -- User Option: magit-wip-initial-backup-mode-lighter 7957 Mode-line lighter for ‘magit-wip-initial-backup-mode’. 7958 7959 7960 File: magit.info, Node: Commands for Buffers Visiting Files, Next: Minor Mode for Buffers Visiting Blobs, Prev: Wip Modes, Up: Miscellaneous 7961 7962 8.10 Commands for Buffers Visiting Files 7963 ======================================== 7964 7965 By default Magit defines a few global key bindings. These bindings are 7966 a compromise between providing no bindings at all and providing the 7967 better bindings I would have liked to use instead. Magit cannot provide 7968 the set of recommended bindings by default because those key sequences 7969 are strictly reserved for bindings added by the user. Also see *note 7970 Global Bindings:: and *note (elisp)Key Binding Conventions::. 7971 7972 To use the recommended bindings, add this to your init file and 7973 restart Emacs. 7974 7975 (setq magit-define-global-key-bindings 'recommended) 7976 7977 If you don’t want Magit to add any bindings to the global keymap at 7978 all, add this to your init file and restart Emacs. 7979 7980 (setq magit-define-global-key-bindings nil) 7981 7982 ‘C-c f’ (‘magit-file-dispatch’) 7983 ‘C-c f s’ (‘magit-stage-file’) 7984 ‘C-c f s’ (‘magit-stage-buffer-file’) 7985 ‘C-c f u’ (‘magit-unstage-file’) 7986 ‘C-c f u’ (‘magit-unstage-buffer-file’) 7987 ‘C-c f , x’ (‘magit-file-untrack’) 7988 ‘C-c f , r’ (‘magit-file-rename’) 7989 ‘C-c f , k’ (‘magit-file-delete’) 7990 ‘C-c f , c’ (‘magit-file-checkout’) 7991 ‘C-c f D’ (‘magit-diff’) 7992 ‘C-c f d’ (‘magit-diff-buffer-file’) 7993 ‘C-c f L’ (‘magit-log’) 7994 ‘C-c f l’ (‘magit-log-buffer-file’) 7995 ‘C-c f t’ (‘magit-log-trace-definition’) 7996 ‘C-c f M’ (‘magit-log-merged’) 7997 ‘C-c f B’ (‘magit-blame’) 7998 ‘C-c f b’ (‘magit-blame-additions’) 7999 ‘C-c f r’ (‘magit-blame-removal’) 8000 ‘C-c f f’ (‘magit-blame-reverse’) 8001 ‘C-c f m’ (‘magit-blame-echo’) 8002 ‘C-c f q’ (‘magit-blame-quit’) 8003 ‘C-c f p’ (‘magit-blob-previous’) 8004 ‘C-c f n’ (‘magit-blob-next’) 8005 ‘C-c f v’ (‘magit-find-file’) 8006 ‘C-c f V’ (‘magit-blob-visit-file’) 8007 ‘C-c f g’ (‘magit-status-here’) 8008 ‘C-c f G’ (‘magit-display-repository-buffer’) 8009 ‘C-c f c’ (‘magit-commit’) 8010 ‘C-c f e’ (‘magit-edit-line-commit’) 8011 Each of these commands is documented individually right below, 8012 alongside their default key bindings. The bindings shown above are 8013 the recommended bindings, which you can enable by following the 8014 instructions further up. 8015 8016 ‘C-c M-g’ (‘magit-file-dispatch’) 8017 This transient prefix command binds the following suffix commands 8018 and displays them in a temporary buffer until a suffix is invoked. 8019 8020 ‘C-c M-g s’ (‘magit-stage-file’) 8021 ‘C-c M-g s’ (‘magit-stage-buffer-file’) 8022 Stage all changes to the file being visited in the current buffer. 8023 When not visiting a file, then the first command is used, which 8024 prompts for a file. 8025 8026 ‘C-c M-g u’ (‘magit-unstage-file’) 8027 ‘C-c M-g u’ (‘magit-unstage-buffer-file’) 8028 Unstage all changes to the file being visited in the current 8029 buffer. When not visiting a file, then the first command is used, 8030 which prompts for a file. 8031 8032 ‘C-c M-g , x’ (‘magit-file-untrack’) 8033 This command untracks a file read from the user, defaulting to the 8034 visited file. 8035 8036 ‘C-c M-g , r’ (‘magit-file-rename’) 8037 This command renames a file read from the user, defaulting to the 8038 visited file. 8039 8040 ‘C-c M-g , k’ (‘magit-file-delete’) 8041 This command deletes a file read from the user, defaulting to the 8042 visited file. 8043 8044 ‘C-c M-g , c’ (‘magit-file-checkout’) 8045 This command updates a file in the working tree and index to the 8046 contents from a revision. Both the revision and file are read from 8047 the user. 8048 8049 ‘C-c M-g D’ (‘magit-diff’) 8050 This transient prefix command binds several diff suffix commands 8051 and infix arguments and displays them in a temporary buffer until a 8052 suffix is invoked. See *note Diffing::. 8053 8054 This is the same command that ‘d’ is bound to in Magit buffers. If 8055 this command is invoked from a file-visiting buffer, then the 8056 initial value of the option (‘--’) that limits the diff to certain 8057 file(s) is set to the visited file. 8058 8059 ‘C-c M-g d’ (‘magit-diff-buffer-file’) 8060 This command shows the diff for the file of blob that the current 8061 buffer visits. 8062 8063 -- User Option: magit-diff-buffer-file-locked 8064 This option controls whether ‘magit-diff-buffer-file’ uses a 8065 dedicated buffer. See *note Modes and Buffers::. 8066 8067 ‘C-c M-g L’ (‘magit-log’) 8068 This transient prefix command binds several log suffix commands and 8069 infix arguments and displays them in a temporary buffer until a 8070 suffix is invoked. See *note Logging::. 8071 8072 This is the same command that ‘l’ is bound to in Magit buffers. If 8073 this command is invoked from a file-visiting buffer, then the 8074 initial value of the option (‘--’) that limits the log to certain 8075 file(s) is set to the visited file. 8076 8077 ‘C-c M-g l’ (‘magit-log-buffer-file’) 8078 This command shows the log for the file of blob that the current 8079 buffer visits. Renames are followed when a prefix argument is used 8080 or when ‘--follow’ is an active log argument. When the region is 8081 active, the log is restricted to the selected line range. 8082 8083 -- User Option: magit-log-buffer-file-locked 8084 This option controls whether ‘magit-log-buffer-file’ uses a 8085 dedicated buffer. See *note Modes and Buffers::. 8086 8087 ‘C-c M-g t’ (‘magit-log-trace-definition’) 8088 This command shows the log for the definition at point. 8089 8090 ‘C-c M-g M’ (‘magit-log-merged’) 8091 This command reads a commit and a branch in shows a log concerning 8092 the merge of the former into the latter. This shows multiple 8093 commits even in case of a fast-forward merge. 8094 8095 ‘C-c M-g B’ (‘magit-blame’) 8096 This transient prefix command binds all blaming suffix commands 8097 along with the appropriate infix arguments and displays them in a 8098 temporary buffer until a suffix is invoked. 8099 8100 For more information about this and the following commands also see 8101 *note Blaming::. 8102 8103 In addition to the ‘magit-blame’ sub-transient, the dispatch 8104 transient also binds several blaming suffix commands directly. See 8105 *note Blaming:: for information about those commands and bindings. 8106 8107 ‘C-c M-g p’ (‘magit-blob-previous’) 8108 This command visits the previous blob which modified the current 8109 file. 8110 8111 ‘C-c M-g n’ (‘magit-blob-next’) 8112 This command visits the next blob which modified the current file. 8113 8114 ‘C-c M-g v’ (‘magit-find-file’) 8115 This command reads a revision and file and visits the respective 8116 blob. 8117 8118 ‘C-c M-g V’ (‘magit-blob-visit-file’) 8119 This command visits the file from the working tree, corresponding 8120 to the current blob. When visiting a blob or the version from the 8121 index, then it goes to the same location in the respective file in 8122 the working tree. 8123 8124 ‘C-c M-g g’ (‘magit-status-here’) 8125 This command displays the status of the current repository in a 8126 buffer, like ‘magit-status’ does. Additionally it tries to go to 8127 the position in that buffer, which corresponds to the position in 8128 the current file-visiting buffer (if any). 8129 8130 ‘C-c M-g G’ (‘magit-display-repository-buffer’) 8131 This command reads and displays a Magit buffer belonging to the 8132 current repository, without refreshing it. 8133 8134 ‘C-c M-g c’ (‘magit-commit’) 8135 This transient prefix command binds the following suffix commands 8136 along with the appropriate infix arguments and displays them in a 8137 temporary buffer until a suffix is invoked. See *note Initiating a 8138 Commit::. 8139 8140 ‘C-c M-g e’ (‘magit-edit-line-commit’) 8141 This command makes the commit editable that added the current line. 8142 8143 With a prefix argument it makes the commit editable that removes 8144 the line, if any. The commit is determined using ‘git blame’ and 8145 made editable using ‘git rebase --interactive’ if it is reachable 8146 from ‘HEAD’, or by checking out the commit (or a branch that points 8147 at it) otherwise. 8148 8149 8150 File: magit.info, Node: Minor Mode for Buffers Visiting Blobs, Prev: Commands for Buffers Visiting Files, Up: Miscellaneous 8151 8152 8.11 Minor Mode for Buffers Visiting Blobs 8153 ========================================== 8154 8155 The ‘magit-blob-mode’ enables certain Magit features in blob-visiting 8156 buffers. Such buffers can be created using ‘magit-find-file’ and some 8157 of the commands mentioned below, which also take care of turning on this 8158 minor mode. Currently this mode only establishes a few key bindings, 8159 but this might be extended. 8160 8161 ‘p’ (‘magit-blob-previous’) 8162 Visit the previous blob which modified the current file. 8163 8164 ‘n’ (‘magit-blob-next’) 8165 Visit the next blob which modified the current file. 8166 8167 ‘q’ (‘magit-kill-this-buffer’) 8168 Kill the current buffer. 8169 8170 8171 File: magit.info, Node: Customizing, Next: Plumbing, Prev: Miscellaneous, Up: Top 8172 8173 9 Customizing 8174 ************* 8175 8176 Both Git and Emacs are highly customizable. Magit is both a Git 8177 porcelain as well as an Emacs package, so it makes sense to customize it 8178 using both Git variables as well as Emacs options. However this 8179 flexibility doesn’t come without problems, including but not limited to 8180 the following. 8181 8182 • Some Git variables automatically have an effect in Magit without 8183 requiring any explicit support. Sometimes that is desirable - in 8184 other cases, it breaks Magit. 8185 8186 When a certain Git setting breaks Magit but you want to keep using 8187 that setting on the command line, then that can be accomplished by 8188 overriding the value for Magit only by appending something like 8189 ‘("-c" "some.variable=compatible-value")’ to 8190 ‘magit-git-global-arguments’. 8191 8192 • Certain settings like ‘fetch.prune=true’ are respected by Magit 8193 commands (because they simply call the respective Git command) but 8194 their value is not reflected in the respective transient buffers. 8195 In this case the ‘--prune’ argument in ‘magit-fetch’ might be 8196 active or inactive, but that doesn’t keep the Git variable from 8197 being honored by the suffix commands anyway. So pruning might 8198 happen despite the ‘--prune’ arguments being displayed in a way 8199 that seems to indicate that no pruning will happen. 8200 8201 I intend to address these and similar issues in a future release. 8202 8203 * Menu: 8204 8205 * Per-Repository Configuration:: 8206 * Essential Settings:: 8207 8208 8209 File: magit.info, Node: Per-Repository Configuration, Next: Essential Settings, Up: Customizing 8210 8211 9.1 Per-Repository Configuration 8212 ================================ 8213 8214 Magit can be configured on a per-repository level using both Git 8215 variables as well as Emacs options. 8216 8217 To set a Git variable for one repository only, simply set it in 8218 ‘/path/to/repo/.git/config’ instead of ‘$HOME/.gitconfig’ or 8219 ‘/etc/gitconfig’. See *note (gitman)git-config::. 8220 8221 Similarly, Emacs options can be set for one repository only by 8222 editing ‘/path/to/repo/.dir-locals.el’. See *note (emacs)Directory 8223 Variables::. For example to disable automatic refreshes of 8224 file-visiting buffers in just one huge repository use this: 8225 8226 • ‘/path/to/huge/repo/.dir-locals.el’ 8227 8228 ((nil . ((magit-refresh-buffers . nil)))) 8229 8230 It might only be costly to insert certain information into Magit 8231 buffers for repositories that are exceptionally large, in which case you 8232 can disable the respective section inserters just for that repository: 8233 8234 • ‘/path/to/tag/invested/repo/.dir-locals.el’ 8235 8236 ((magit-status-mode 8237 . ((eval . (magit-disable-section-inserter 'magit-insert-tags-header))))) 8238 8239 -- Function: magit-disable-section-inserter fn 8240 This function disables the section inserter FN in the current 8241 repository. It is only intended for use in ‘.dir-locals.el’ and 8242 ‘.dir-locals-2.el’. 8243 8244 If you want to apply the same settings to several, but not all, 8245 repositories then keeping the repository-local config files in sync 8246 would quickly become annoying. To avoid that you can create config 8247 files for certain classes of repositories (e.g., "huge repositories") 8248 and then include those files in the per-repository config files. For 8249 example: 8250 8251 • ‘/path/to/huge/repo/.git/config’ 8252 8253 [include] 8254 path = /path/to/huge-gitconfig 8255 8256 • ‘/path/to/huge-gitconfig’ 8257 8258 [status] 8259 showUntrackedFiles = no 8260 8261 • ‘$HOME/.emacs.d/init.el’ 8262 8263 (dir-locals-set-class-variables 'huge-git-repository 8264 '((nil . ((magit-refresh-buffers . nil))))) 8265 8266 (dir-locals-set-directory-class 8267 "/path/to/huge/repo/" 'huge-git-repository) 8268 8269 8270 File: magit.info, Node: Essential Settings, Prev: Per-Repository Configuration, Up: Customizing 8271 8272 9.2 Essential Settings 8273 ====================== 8274 8275 The next three sections list and discuss several variables that many 8276 users might want to customize, for safety and/or performance reasons. 8277 8278 * Menu: 8279 8280 * Safety:: 8281 * Performance:: 8282 * Global Bindings:: 8283 8284 8285 File: magit.info, Node: Safety, Next: Performance, Up: Essential Settings 8286 8287 9.2.1 Safety 8288 ------------ 8289 8290 This section discusses various variables that you might want to change 8291 (or *not* change) for safety reasons. 8292 8293 Git keeps *committed* changes around long enough for users to recover 8294 changes they have accidentally been deleted. It does not do the same 8295 for *uncommitted* changes in the working tree and not even the index 8296 (the staging area). Because Magit makes it so easy to modify 8297 uncommitted changes, it also makes it easy to shoot yourself in the foot 8298 in the process. For that reason Magit provides three global modes that 8299 save *tracked* files to work-in-progress references after or before 8300 certain actions. See *note Wip Modes::. 8301 8302 These modes are not enabled by default because of performance 8303 concerns. Instead a lot of potentially destructive commands require 8304 confirmation every time they are used. In many cases this can be 8305 disabled by adding a symbol to ‘magit-no-confirm’ (see *note Completion 8306 and Confirmation::). If you enable the various wip modes then you 8307 should add ‘safe-with-wip’ to this list. 8308 8309 Similarly it isn’t necessary to require confirmation before moving a 8310 file to the system trash - if you trashed a file by mistake then you can 8311 recover it from there. Option ‘magit-delete-by-moving-to-trash’ 8312 controls whether the system trash is used, which is the case by default. 8313 Nevertheless, ‘trash’ isn’t a member of ‘magit-no-confirm’ - you might 8314 want to change that. 8315 8316 By default buffers visiting files are automatically reverted when the 8317 visited file changes on disk. This isn’t as risky as it might seem, but 8318 to make an informed decision you should see *note Risk of Reverting 8319 Automatically::. 8320 8321 8322 File: magit.info, Node: Performance, Next: Global Bindings, Prev: Safety, Up: Essential Settings 8323 8324 9.2.2 Performance 8325 ----------------- 8326 8327 After Magit has run ‘git’ for side-effects, it also refreshes the 8328 current Magit buffer and the respective status buffer. This is 8329 necessary because otherwise outdated information might be displayed 8330 without the user noticing. Magit buffers are updated by recreating 8331 their content from scratch, which makes updating simpler and less 8332 error-prone, but also more costly. Keeping it simple and just 8333 re-creating everything from scratch is an old design decision and 8334 departing from that will require major refactoring. 8335 8336 Meanwhile you can tell Magit to only automatically refresh the 8337 current Magit buffer, but not the status buffer. If you do that, then 8338 the status buffer is only refreshed automatically if it is the current 8339 buffer. 8340 8341 (setq magit-refresh-status-buffer nil) 8342 8343 You should also check whether any third-party packages have added 8344 anything to ‘magit-refresh-buffer-hook’, ‘magit-pre-refresh-hook’, and 8345 ‘magit-post-refresh-hook’. If so, then check whether those additions 8346 impact performance significantly. 8347 8348 Magit can be told to refresh buffers verbosely using ‘M-x 8349 magit-toggle-verbose-refresh’. Enabling this helps figuring out which 8350 sections are bottlenecks. Each line printed to the ‘*Messages*’ buffer 8351 contains a section name, the number of seconds it took to show this 8352 section, and from 0 to 2 exclamation marks: the more exclamation marks 8353 the slower the section is. 8354 8355 Magit also reverts buffers for visited files located inside the 8356 current repository when the visited file changes on disk. That is 8357 implemented on top of ‘auto-revert-mode’ from the built-in library 8358 ‘autorevert’. To figure out whether that impacts performance, check 8359 whether performance is significantly worse, when many buffers exist 8360 and/or when some buffers visit files using TRAMP. If so, then this 8361 should help. 8362 8363 (setq auto-revert-buffer-list-filter 8364 'magit-auto-revert-repository-buffer-p) 8365 8366 For alternative approaches see *note Automatic Reverting of 8367 File-Visiting Buffers::. 8368 8369 If you have enabled any features that are disabled by default, then 8370 you should check whether they impact performance significantly. It’s 8371 likely that they were not enabled by default because it is known that 8372 they reduce performance at least in large repositories. 8373 8374 If performance is only slow inside certain unusually large 8375 repositories, then you might want to disable certain features on a 8376 per-repository or per-repository-class basis only. See *note 8377 Per-Repository Configuration::. For example it takes a long time to 8378 determine the next and current tag in repository with exceptional 8379 numbers of tags. It would therefore be a good idea to disable 8380 ‘magit-insert-tags-headers’, as explained at the mentioned node. 8381 8382 * Menu: 8383 8384 * Microsoft Windows Performance:: 8385 * MacOS Performance:: 8386 8387 Log Performance 8388 ............... 8389 8390 When showing logs, Magit limits the number of commits initially shown in 8391 the hope that this avoids unnecessary work. When ‘--graph’ is used, 8392 then this unfortunately does not have the desired effect for large 8393 histories. Junio, Git’s maintainer, said on the Git mailing list 8394 (<https://www.spinics.net/lists/git/msg232230.html>): "‘--graph’ wants 8395 to compute the whole history and the max-count only affects the output 8396 phase after ‘--graph’ does its computation". 8397 8398 In other words, it’s not that Git is slow at outputting the 8399 differences, or that Magit is slow at parsing the output - the problem 8400 is that Git first goes outside and has a smoke. 8401 8402 We actually work around this issue by limiting the number of commits 8403 not only by using ‘-<N>’ but by also using a range. But unfortunately 8404 that’s not always possible. 8405 8406 When more than a few thousand commits are shown, then the use of 8407 ‘--graph’ can slow things down. 8408 8409 Using ‘--color --graph’ is even slower. Magit uses code that is part 8410 of Emacs to turn control characters into faces. That code is pretty 8411 slow and this is quite noticeable when showing a log with many branches 8412 and merges. For that reason ‘--color’ is not enabled by default 8413 anymore. Consider leaving it at that. 8414 8415 Diff Performance 8416 ................ 8417 8418 If diffs are slow, then consider turning off some optional diff features 8419 by setting all or some of the following variables to ‘nil’: 8420 ‘magit-diff-highlight-indentation’, ‘magit-diff-highlight-trailing’, 8421 ‘magit-diff-paint-whitespace’, ‘magit-diff-highlight-hunk-body’, and 8422 ‘magit-diff-refine-hunk’. 8423 8424 When showing a commit instead of some arbitrary diff, then some 8425 additional information is displayed. Calculating this information can 8426 be quite expensive given certain circumstances. If looking at a commit 8427 using ‘magit-revision-mode’ takes considerably more time than looking at 8428 the same commit in ‘magit-diff-mode’, then consider setting 8429 ‘magit-revision-insert-related-refs’ to ‘nil’. 8430 8431 When you are often confronted with diffs that contain deleted files, 8432 then you might want to enable the ‘--irreversible-delete’ argument. If 8433 you do that then diffs still show that a file was deleted but without 8434 also showing the complete deleted content of the file. This argument is 8435 not available by default, see *note (transient)Enabling and Disabling 8436 Suffixes::. Once you have done that you should enable it and save that 8437 setting, see *note (transient)Saving Values::. You should do this in 8438 both the diff (‘d’) and the diff refresh (‘D’) transient popups. 8439 8440 Refs Buffer Performance 8441 ....................... 8442 8443 When refreshing the "references buffer" is slow, then that’s usually 8444 because several hundred refs are being displayed. The best way to 8445 address that is to display fewer refs, obviously. 8446 8447 If you are not, or only mildly, interested in seeing the list of 8448 tags, then start by not displaying them: 8449 8450 (remove-hook 'magit-refs-sections-hook 'magit-insert-tags) 8451 8452 Then you should also make sure that the listed remote branches 8453 actually all exist. You can do so by pruning branches which no longer 8454 exist using ‘f-pa’. 8455 8456 Committing Performance 8457 ...................... 8458 8459 When you initiate a commit, then Magit by default automatically shows a 8460 diff of the changes you are about to commit. For large commits this can 8461 take a long time, which is especially distracting when you are 8462 committing large amounts of generated data which you don’t actually 8463 intend to inspect before committing. This behavior can be turned off 8464 using: 8465 8466 (remove-hook 'server-switch-hook 'magit-commit-diff) 8467 (remove-hook 'with-editor-filter-visit-hook 'magit-commit-diff) 8468 8469 Then you can type ‘C-c C-d’ to show the diff when you actually want 8470 to see it, but only then. Alternatively you can leave the hook alone 8471 and just type ‘C-g’ in those cases when it takes too long to generate 8472 the diff. If you do that, then you will end up with a broken diff 8473 buffer, but doing it this way has the advantage that you usually get to 8474 see the diff, which is useful because it increases the odds that you 8475 spot potential issues. 8476 8477 8478 File: magit.info, Node: Microsoft Windows Performance, Next: MacOS Performance, Up: Performance 8479 8480 Microsoft Windows Performance 8481 ............................. 8482 8483 In order to update the status buffer, ‘git’ has to be run a few dozen 8484 times. That is problematic on Microsoft Windows, because that operating 8485 system is exceptionally slow at starting processes. Sadly this is an 8486 issue that can only be fixed by Microsoft itself, and they don’t appear 8487 to be particularly interested in doing so. 8488 8489 Beside the subprocess issue, there are also other Windows-specific 8490 performance issues. Some of these have workarounds. The maintainers of 8491 "Git for Windows" try to improve performance on Windows. Always use the 8492 latest release in order to benefit from the latest performance tweaks. 8493 Magit too tries to work around some Windows-specific issues. 8494 8495 According to some sources, setting the following Git variables can 8496 also help. 8497 8498 git config --global core.preloadindex true # default since v2.1 8499 git config --global core.fscache true # default since v2.8 8500 git config --global gc.auto 256 8501 8502 You should also check whether an anti-virus program is affecting 8503 performance. 8504 8505 8506 File: magit.info, Node: MacOS Performance, Prev: Microsoft Windows Performance, Up: Performance 8507 8508 MacOS Performance 8509 ................. 8510 8511 Before Emacs 26.1 child processes were created using ‘fork’ on macOS. 8512 That needlessly copied GUI resources, which is expensive. The result 8513 was that forking took about 30 times as long on Darwin than on Linux, 8514 and because Magit starts many ‘git’ processes that made quite a 8515 difference. 8516 8517 So make sure that you are using at least Emacs 26.1, in which case 8518 the faster ‘vfork’ will be used. (The creation of child processes still 8519 takes about twice as long on Darwin compared to Linux.) See (1) for 8520 more information. 8521 8522 Additionally, ‘git’ installed from a package manager like ‘brew’ or 8523 ‘nix’ seems to be slower than the native executable. Profile the ‘git’ 8524 executable you’re running against the one at ‘/usr/bin/git’, and if you 8525 notice a notable difference try using the latter as 8526 ‘magit-git-executable’. 8527 8528 ---------- Footnotes ---------- 8529 8530 (1) 8531 <https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html> 8532 8533 8534 File: magit.info, Node: Global Bindings, Prev: Performance, Up: Essential Settings 8535 8536 9.2.3 Global Bindings 8537 --------------------- 8538 8539 -- User Option: magit-define-global-key-bindings 8540 This option controls which set of Magit key bindings, if any, may 8541 be added to the global keymap, even before Magit is first used in 8542 the current Emacs session. 8543 8544 • If the value is ‘nil’, no bindings are added. 8545 8546 • If ‘default’, maybe add: 8547 8548 ‘C-x g’ ‘magit-status’ 8549 ‘C-x M-g’ ‘magit-dispatch’ 8550 ‘C-c M-g’ ‘magit-file-dispatch’ 8551 8552 • If ‘recommended’, maybe add: 8553 8554 ‘C-x g’ ‘magit-status’ 8555 ‘C-c g’ ‘magit-dispatch’ 8556 ‘C-c f’ ‘magit-file-dispatch’ 8557 8558 These bindings are strongly recommended, but we cannot use 8559 them by default, because the ‘C-c <LETTER>’ namespace is 8560 strictly reserved for bindings added by the user (see *note 8561 (elisp)Key Binding Conventions::). 8562 8563 The bindings in the chosen set may be added when ‘after-init-hook’ 8564 is run. Each binding is added if, and only if, at that time no 8565 other key is bound to the same command, and no other command is 8566 bound to the same key. In other words we try to avoid adding 8567 bindings that are unnecessary, as well as bindings that conflict 8568 with other bindings. 8569 8570 Adding these bindings is delayed until ‘after-init-hook’ is run to 8571 allow users to set the variable anywhere in their init file 8572 (without having to make sure to do so before ‘magit’ is loaded or 8573 autoloaded) and to increase the likelihood that all the potentially 8574 conflicting user bindings have already been added. 8575 8576 To set this variable use either ‘setq’ or the Custom interface. Do 8577 not use the function ‘customize-set-variable’ because doing that 8578 would cause Magit to be loaded immediately, when that form is 8579 evaluated (this differs from ‘custom-set-variables’, which doesn’t 8580 load the libraries that define the customized variables). 8581 8582 Setting this variable has no effect if ‘after-init-hook’ has 8583 already been run. 8584 8585 8586 File: magit.info, Node: Plumbing, Next: FAQ, Prev: Customizing, Up: Top 8587 8588 10 Plumbing 8589 *********** 8590 8591 The following sections describe how to use several of Magit’s core 8592 abstractions to extend Magit itself or implement a separate extension. 8593 8594 A few of the low-level features used by Magit have been factored out 8595 into separate libraries/packages, so that they can be used by other 8596 packages, without having to depend on Magit. See *note 8597 (with-editor)Top:: for information about ‘with-editor’. ‘transient’ 8598 doesn’t have a manual yet. 8599 8600 If you are trying to find an unused key that you can bind to a 8601 command provided by your own Magit extension, then checkout 8602 <https://github.com/magit/magit/wiki/Plugin-Dispatch-Key-Registry>. 8603 8604 * Menu: 8605 8606 * Calling Git:: 8607 * Section Plumbing:: 8608 * Refreshing Buffers:: 8609 * Conventions:: 8610 8611 8612 File: magit.info, Node: Calling Git, Next: Section Plumbing, Up: Plumbing 8613 8614 10.1 Calling Git 8615 ================ 8616 8617 Magit provides many specialized functions for calling Git. All of these 8618 functions are defined in either ‘magit-git.el’ or ‘magit-process.el’ and 8619 have one of the prefixes ‘magit-run-’, ‘magit-call-’, ‘magit-start-’, or 8620 ‘magit-git-’ (which is also used for other things). 8621 8622 All of these functions accept an indefinite number of arguments, 8623 which are strings that specify command line arguments for Git (or in 8624 some cases an arbitrary executable). These arguments are flattened 8625 before being passed on to the executable; so instead of strings they can 8626 also be lists of strings and arguments that are ‘nil’ are silently 8627 dropped. Some of these functions also require a single mandatory 8628 argument before these command line arguments. 8629 8630 Roughly speaking, these functions run Git either to get some value or 8631 for side-effects. The functions that return a value are useful to 8632 collect the information necessary to populate a Magit buffer, while the 8633 others are used to implement Magit commands. 8634 8635 The functions in the value-only group always run synchronously, and 8636 they never trigger a refresh. The function in the side-effect group can 8637 be further divided into subgroups depending on whether they run Git 8638 synchronously or asynchronously, and depending on whether they trigger a 8639 refresh when the executable has finished. 8640 8641 * Menu: 8642 8643 * Getting a Value from Git:: 8644 * Calling Git for Effect:: 8645 8646 8647 File: magit.info, Node: Getting a Value from Git, Next: Calling Git for Effect, Up: Calling Git 8648 8649 10.1.1 Getting a Value from Git 8650 ------------------------------- 8651 8652 These functions run Git in order to get a value, an exit status, or 8653 output. Of course you could also use them to run Git commands that have 8654 side-effects, but that should be avoided. 8655 8656 -- Function: magit-git-exit-code &rest args 8657 Executes git with ARGS and returns its exit code. 8658 8659 -- Function: magit-git-success &rest args 8660 Executes git with ARGS and returns ‘t’ if the exit code is ‘0’, 8661 ‘nil’ otherwise. 8662 8663 -- Function: magit-git-failure &rest args 8664 Executes git with ARGS and returns ‘t’ if the exit code is ‘1’, 8665 ‘nil’ otherwise. 8666 8667 -- Function: magit-git-true &rest args 8668 Executes git with ARGS and returns ‘t’ if the first line printed by 8669 git is the string "true", ‘nil’ otherwise. 8670 8671 -- Function: magit-git-false &rest args 8672 Executes git with ARGS and returns ‘t’ if the first line printed by 8673 git is the string "false", ‘nil’ otherwise. 8674 8675 -- Function: magit-git-insert &rest args 8676 Executes git with ARGS and inserts its output at point. 8677 8678 -- Function: magit-git-string &rest args 8679 Executes git with ARGS and returns the first line of its output. 8680 If there is no output or if it begins with a newline character, 8681 then this returns ‘nil’. 8682 8683 -- Function: magit-git-lines &rest args 8684 Executes git with ARGS and returns its output as a list of lines. 8685 Empty lines anywhere in the output are omitted. 8686 8687 -- Function: magit-git-items &rest args 8688 Executes git with ARGS and returns its null-separated output as a 8689 list. Empty items anywhere in the output are omitted. 8690 8691 If the value of option ‘magit-git-debug’ is non-nil and git exits 8692 with a non-zero exit status, then warn about that in the echo area 8693 and add a section containing git’s standard error in the current 8694 repository’s process buffer. 8695 8696 -- Function: magit-process-git destination &rest args 8697 Calls Git synchronously in a separate process, returning its exit 8698 code. DESTINATION specifies how to handle the output, like for 8699 ‘call-process’, except that file handlers are supported. Enables 8700 Cygwin’s "noglob" option during the call and ensures unix eol 8701 conversion. 8702 8703 -- Function: magit-process-file process &optional infile buffer display 8704 &rest args 8705 Processes files synchronously in a separate process. Identical to 8706 ‘process-file’ but temporarily enables Cygwin’s "noglob" option 8707 during the call and ensures unix eol conversion. 8708 8709 If an error occurs when using one of the above functions, then that 8710 is usually due to a bug, i.e., using an argument which is not actually 8711 supported. Such errors are usually not reported, but when they occur we 8712 need to be able to debug them. 8713 8714 -- User Option: magit-git-debug 8715 Whether to report errors that occur when using ‘magit-git-insert’, 8716 ‘magit-git-string’, ‘magit-git-lines’, or ‘magit-git-items’. This 8717 does not actually raise an error. Instead a message is shown in 8718 the echo area, and git’s standard error is insert into a new 8719 section in the current repository’s process buffer. 8720 8721 -- Function: magit-git-str &rest args 8722 This is a variant of ‘magit-git-string’ that ignores the option 8723 ‘magit-git-debug’. It is mainly intended to be used while handling 8724 errors in functions that do respect that option. Using such a 8725 function while handing an error could cause yet another error and 8726 therefore lead to an infinite recursion. You probably won’t ever 8727 need to use this function. 8728 8729 8730 File: magit.info, Node: Calling Git for Effect, Prev: Getting a Value from Git, Up: Calling Git 8731 8732 10.1.2 Calling Git for Effect 8733 ----------------------------- 8734 8735 These functions are used to run git to produce some effect. Most Magit 8736 commands that actually run git do so by using such a function. 8737 8738 Because we do not need to consume git’s output when using these 8739 functions, their output is instead logged into a per-repository buffer, 8740 which can be shown using ‘$’ from a Magit buffer or ‘M-x magit-process’ 8741 elsewhere. 8742 8743 These functions can have an effect in two distinct ways. Firstly, 8744 running git may change something, i.e., create or push a new commit. 8745 Secondly, that change may require that Magit buffers are refreshed to 8746 reflect the changed state of the repository. But refreshing isn’t 8747 always desirable, so only some of these functions do perform such a 8748 refresh after git has returned. 8749 8750 Sometimes it is useful to run git asynchronously. For example, when 8751 the user has just initiated a push, then there is no reason to make her 8752 wait until that has completed. In other cases it makes sense to wait 8753 for git to complete before letting the user do something else. For 8754 example after staging a change it is useful to wait until after the 8755 refresh because that also automatically moves to the next change. 8756 8757 -- Function: magit-call-git &rest args 8758 Calls git synchronously with ARGS. 8759 8760 -- Function: magit-call-process program &rest args 8761 Calls PROGRAM synchronously with ARGS. 8762 8763 -- Function: magit-run-git &rest args 8764 Calls git synchronously with ARGS and then refreshes. 8765 8766 -- Function: magit-run-git-with-input &rest args 8767 Calls git synchronously with ARGS and sends it the content of the 8768 current buffer on standard input. 8769 8770 If the current buffer’s ‘default-directory’ is on a remote 8771 filesystem, this function actually runs git asynchronously. But 8772 then it waits for the process to return, so the function itself is 8773 synchronous. 8774 8775 -- Function: magit-git &rest args 8776 Calls git synchronously with ARGS for side-effects only. This 8777 function does not refresh the buffer. 8778 8779 -- Function: magit-git-wash washer &rest args 8780 Execute Git with ARGS, inserting washed output at point. Actually 8781 first insert the raw output at point. If there is no output call 8782 ‘magit-cancel-section’. Otherwise temporarily narrow the buffer to 8783 the inserted text, move to its beginning, and then call function 8784 WASHER with ARGS as its sole argument. 8785 8786 And now for the asynchronous variants. 8787 8788 -- Function: magit-run-git-async &rest args 8789 Start Git, prepare for refresh, and return the process object. 8790 ARGS is flattened and then used as arguments to Git. 8791 8792 Display the command line arguments in the echo area. 8793 8794 After Git returns some buffers are refreshed: the buffer that was 8795 current when this function was called (if it is a Magit buffer and 8796 still alive), as well as the respective Magit status buffer. 8797 Unmodified buffers visiting files that are tracked in the current 8798 repository are reverted if ‘magit-revert-buffers’ is non-nil. 8799 8800 -- Function: magit-run-git-with-editor &rest args 8801 Export GIT_EDITOR and start Git. Also prepare for refresh and 8802 return the process object. ARGS is flattened and then used as 8803 arguments to Git. 8804 8805 Display the command line arguments in the echo area. 8806 8807 After Git returns some buffers are refreshed: the buffer that was 8808 current when this function was called (if it is a Magit buffer and 8809 still alive), as well as the respective Magit status buffer. 8810 8811 -- Function: magit-start-git input &rest args 8812 Start Git, prepare for refresh, and return the process object. 8813 8814 If INPUT is non-nil, it has to be a buffer or the name of an 8815 existing buffer. The buffer content becomes the processes standard 8816 input. 8817 8818 Option ‘magit-git-executable’ specifies the Git executable and 8819 option ‘magit-git-global-arguments’ specifies constant arguments. 8820 The remaining arguments ARGS specify arguments to Git. They are 8821 flattened before use. 8822 8823 After Git returns, some buffers are refreshed: the buffer that was 8824 current when this function was called (if it is a Magit buffer and 8825 still alive), as well as the respective Magit status buffer. 8826 Unmodified buffers visiting files that are tracked in the current 8827 repository are reverted if ‘magit-revert-buffers’ is non-nil. 8828 8829 -- Function: magit-start-process &rest args 8830 Start PROGRAM, prepare for refresh, and return the process object. 8831 8832 If optional argument INPUT is non-nil, it has to be a buffer or the 8833 name of an existing buffer. The buffer content becomes the 8834 processes standard input. 8835 8836 The process is started using ‘start-file-process’ and then setup to 8837 use the sentinel ‘magit-process-sentinel’ and the filter 8838 ‘magit-process-filter’. Information required by these functions is 8839 stored in the process object. When this function returns the 8840 process has not started to run yet so it is possible to override 8841 the sentinel and filter. 8842 8843 After the process returns, ‘magit-process-sentinel’ refreshes the 8844 buffer that was current when ‘magit-start-process’ was called (if 8845 it is a Magit buffer and still alive), as well as the respective 8846 Magit status buffer. Unmodified buffers visiting files that are 8847 tracked in the current repository are reverted if 8848 ‘magit-revert-buffers’ is non-nil. 8849 8850 -- Variable: magit-this-process 8851 The child process which is about to start. This can be used to 8852 change the filter and sentinel. 8853 8854 -- Variable: magit-process-raise-error 8855 When this is non-nil, then ‘magit-process-sentinel’ raises an error 8856 if git exits with a non-zero exit status. For debugging purposes. 8857 8858 8859 File: magit.info, Node: Section Plumbing, Next: Refreshing Buffers, Prev: Calling Git, Up: Plumbing 8860 8861 10.2 Section Plumbing 8862 ===================== 8863 8864 * Menu: 8865 8866 * Creating Sections:: 8867 * Section Selection:: 8868 * Matching Sections:: 8869 8870 8871 File: magit.info, Node: Creating Sections, Next: Section Selection, Up: Section Plumbing 8872 8873 10.2.1 Creating Sections 8874 ------------------------ 8875 8876 -- Macro: magit-insert-section &rest args 8877 Insert a section at point. 8878 8879 TYPE is the section type, a symbol. Many commands that act on the 8880 current section behave differently depending on that type. Also if 8881 a variable ‘magit-TYPE-section-map’ exists, then use that as the 8882 text-property ‘keymap’ of all text belonging to the section (but 8883 this may be overwritten in subsections). TYPE can also have the 8884 form ‘(eval FORM)’ in which case FORM is evaluated at runtime. 8885 8886 Optional VALUE is the value of the section, usually a string that 8887 is required when acting on the section. 8888 8889 When optional HIDE is non-nil collapse the section body by default, 8890 i.e., when first creating the section, but not when refreshing the 8891 buffer. Otherwise, expand it by default. This can be overwritten 8892 using ‘magit-section-set-visibility-hook’. When a section is 8893 recreated during a refresh, then the visibility of predecessor is 8894 inherited and HIDE is ignored (but the hook is still honored). 8895 8896 BODY is any number of forms that actually insert the section’s 8897 heading and body. Optional NAME, if specified, has to be a symbol, 8898 which is then bound to the struct of the section being inserted. 8899 8900 Before BODY is evaluated the ‘start’ of the section object is set 8901 to the value of ‘point’ and after BODY was evaluated its ‘end’ is 8902 set to the new value of ‘point’; BODY is responsible for moving 8903 ‘point’ forward. 8904 8905 If it turns out inside BODY that the section is empty, then 8906 ‘magit-cancel-section’ can be used to abort and remove all traces 8907 of the partially inserted section. This can happen when creating a 8908 section by washing Git’s output and Git didn’t actually output 8909 anything this time around. 8910 8911 -- Function: magit-insert-heading &rest args 8912 Insert the heading for the section currently being inserted. 8913 8914 This function should only be used inside ‘magit-insert-section’. 8915 8916 When called without any arguments, then just set the ‘content’ slot 8917 of the object representing the section being inserted to a marker 8918 at ‘point’. The section should only contain a single line when 8919 this function is used like this. 8920 8921 When called with arguments ARGS, which have to be strings, then 8922 insert those strings at point. The section should not contain any 8923 text before this happens and afterwards it should again only 8924 contain a single line. If the ‘face’ property is set anywhere 8925 inside any of these strings, then insert all of them unchanged. 8926 Otherwise use the ‘magit-section-heading’ face for all inserted 8927 text. 8928 8929 The ‘content’ property of the section struct is the end of the 8930 heading (which lasts from ‘start’ to ‘content’) and the beginning 8931 of the body (which lasts from ‘content’ to ‘end’). If the value of 8932 ‘content’ is nil, then the section has no heading and its body 8933 cannot be collapsed. If a section does have a heading then its 8934 height must be exactly one line, including a trailing newline 8935 character. This isn’t enforced; you are responsible for getting it 8936 right. The only exception is that this function does insert a 8937 newline character if necessary. 8938 8939 -- Function: magit-cancel-section 8940 Cancel the section currently being inserted. This exits the 8941 innermost call to ‘magit-insert-section’ and removes all traces of 8942 what has already happened inside that call. 8943 8944 -- Function: magit-define-section-jumper sym title &optional value 8945 Define an interactive function to go to section SYM. TITLE is the 8946 displayed title of the section. 8947 8948 8949 File: magit.info, Node: Section Selection, Next: Matching Sections, Prev: Creating Sections, Up: Section Plumbing 8950 8951 10.2.2 Section Selection 8952 ------------------------ 8953 8954 -- Function: magit-current-section 8955 Return the section at point. 8956 8957 -- Function: magit-region-sections &optional condition multiple 8958 Return a list of the selected sections. 8959 8960 When the region is active and constitutes a valid section 8961 selection, then return a list of all selected sections. This is 8962 the case when the region begins in the heading of a section and 8963 ends in the heading of the same section or in that of a sibling 8964 section. If optional MULTIPLE is non-nil, then the region cannot 8965 begin and end in the same section. 8966 8967 When the selection is not valid, then return nil. In this case, 8968 most commands that can act on the selected sections will instead 8969 act on the section at point. 8970 8971 When the region looks like it would in any other buffer then the 8972 selection is invalid. When the selection is valid then the region 8973 uses the ‘magit-section-highlight’ face. This does not apply to 8974 diffs where things get a bit more complicated, but even here if the 8975 region looks like it usually does, then that’s not a valid 8976 selection as far as this function is concerned. 8977 8978 If optional CONDITION is non-nil, then the selection not only has 8979 to be valid; all selected sections additionally have to match 8980 CONDITION, or nil is returned. See ‘magit-section-match’ for the 8981 forms CONDITION can take. 8982 8983 -- Function: magit-region-values &optional condition multiple 8984 Return a list of the values of the selected sections. 8985 8986 Return the values that themselves would be returned by 8987 ‘magit-region-sections’ (which see). 8988 8989 8990 File: magit.info, Node: Matching Sections, Prev: Section Selection, Up: Section Plumbing 8991 8992 10.2.3 Matching Sections 8993 ------------------------ 8994 8995 ‘M-x magit-describe-section-briefly’ 8996 Show information about the section at point. This command is 8997 intended for debugging purposes. 8998 8999 -- Function: magit-section-ident section 9000 Return an unique identifier for SECTION. The return value has the 9001 form ‘((TYPE . VALUE)...)’. 9002 9003 -- Function: magit-get-section ident &optional root 9004 Return the section identified by IDENT. IDENT has to be a list as 9005 returned by ‘magit-section-ident’. 9006 9007 -- Function: magit-section-match condition &optional section 9008 Return ‘t’ if SECTION matches CONDITION. SECTION defaults to the 9009 section at point. If SECTION is not specified and there also is no 9010 section at point, then return ‘nil’. 9011 9012 CONDITION can take the following forms: 9013 • ‘(CONDITION...)’ 9014 9015 matches if any of the CONDITIONs matches. 9016 9017 • ‘[CLASS...]’ 9018 9019 matches if the section’s class is the same as the first CLASS 9020 or a subclass of that; the section’s parent class matches the 9021 second CLASS; and so on. 9022 9023 • ‘[* CLASS...]’ 9024 9025 matches sections that match ‘[CLASS...]’ and also recursively 9026 all their child sections. 9027 9028 • ‘CLASS’ 9029 9030 matches if the section’s class is the same as CLASS or a 9031 subclass of that; regardless of the classes of the parent 9032 sections. 9033 9034 Each CLASS should be a class symbol, identifying a class that 9035 derives from ‘magit-section’. For backward compatibility CLASS can 9036 also be a "type symbol". A section matches such a symbol if the 9037 value of its ‘type’ slot is ‘eq’. If a type symbol has an entry in 9038 ‘magit--section-type-alist’, then a section also matches that type 9039 if its class is a subclass of the class that corresponds to the 9040 type as per that alist. 9041 9042 Note that it is not necessary to specify the complete section 9043 lineage as printed by ‘magit-describe-section-briefly’, unless of 9044 course you want to be that precise. 9045 9046 -- Function: magit-section-value-if condition &optional section 9047 If the section at point matches CONDITION, then return its value. 9048 9049 If optional SECTION is non-nil then test whether that matches 9050 instead. If there is no section at point and SECTION is nil, then 9051 return nil. If the section does not match, then return nil. 9052 9053 See ‘magit-section-match’ for the forms CONDITION can take. 9054 9055 -- Function: magit-section-case &rest clauses 9056 Choose among clauses on the type of the section at point. 9057 9058 Each clause looks like (CONDITION BODY...). The type of the 9059 section is compared against each CONDITION; the BODY forms of the 9060 first match are evaluated sequentially and the value of the last 9061 form is returned. Inside BODY the symbol ‘it’ is bound to the 9062 section at point. If no clause succeeds or if there is no section 9063 at point return nil. 9064 9065 See ‘magit-section-match’ for the forms CONDITION can take. 9066 Additionally a CONDITION of t is allowed in the final clause and 9067 matches if no other CONDITION match, even if there is no section at 9068 point. 9069 9070 -- Variable: magit-root-section 9071 The root section in the current buffer. All other sections are 9072 descendants of this section. The value of this variable is set by 9073 ‘magit-insert-section’ and you should never modify it. 9074 9075 For diff related sections a few additional tools exist. 9076 9077 -- Function: magit-diff-type &optional section 9078 Return the diff type of SECTION. 9079 9080 The returned type is one of the symbols ‘staged’, ‘unstaged’, 9081 ‘committed’, or ‘undefined’. This type serves a similar purpose as 9082 the general type common to all sections (which is stored in the 9083 ‘type’ slot of the corresponding ‘magit-section’ struct) but takes 9084 additional information into account. When the SECTION isn’t 9085 related to diffs and the buffer containing it also isn’t a 9086 diff-only buffer, then return nil. 9087 9088 Currently the type can also be one of ‘tracked’ and ‘untracked’, 9089 but these values are not handled explicitly in every place they 9090 should be. A possible fix could be to just return nil here. 9091 9092 The section has to be a ‘diff’ or ‘hunk’ section, or a section 9093 whose children are of type ‘diff’. If optional SECTION is nil, 9094 return the diff type for the current section. In buffers whose 9095 major mode is ‘magit-diff-mode’ SECTION is ignored and the type is 9096 determined using other means. In ‘magit-revision-mode’ buffers the 9097 type is always ‘committed’. 9098 9099 -- Function: magit-diff-scope &optional section strict 9100 Return the diff scope of SECTION or the selected section(s). 9101 9102 A diff’s "scope" describes what part of a diff is selected, it is a 9103 symbol, one of ‘region’, ‘hunk’, ‘hunks’, ‘file’, ‘files’, or 9104 ‘list’. Do not confuse this with the diff "type", as returned by 9105 ‘magit-diff-type’. 9106 9107 If optional SECTION is non-nil, then return the scope of that, 9108 ignoring the sections selected by the region. Otherwise return the 9109 scope of the current section, or if the region is active and 9110 selects a valid group of diff related sections, the type of these 9111 sections, i.e., ‘hunks’ or ‘files’. If SECTION (or if the current 9112 section that is nil) is a ‘hunk’ section and the region starts and 9113 ends inside the body of a that section, then the type is ‘region’. 9114 9115 If optional STRICT is non-nil then return nil if the diff type of 9116 the section at point is ‘untracked’ or the section at point is not 9117 actually a ‘diff’ but a ‘diffstat’ section. 9118 9119 9120 File: magit.info, Node: Refreshing Buffers, Next: Conventions, Prev: Section Plumbing, Up: Plumbing 9121 9122 10.3 Refreshing Buffers 9123 ======================= 9124 9125 All commands that create a new Magit buffer or change what is being 9126 displayed in an existing buffer do so by calling ‘magit-mode-setup’. 9127 Among other things, that function sets the buffer local values of 9128 ‘default-directory’ (to the top-level of the repository), 9129 ‘magit-refresh-function’, and ‘magit-refresh-args’. 9130 9131 Buffers are refreshed by calling the function that is the local value 9132 of ‘magit-refresh-function’ (a function named ‘magit-*-refresh-buffer’, 9133 where ‘*’ may be something like ‘diff’) with the value of 9134 ‘magit-refresh-args’ as arguments. 9135 9136 -- Macro: magit-mode-setup buffer switch-func mode refresh-func 9137 &optional refresh-args 9138 This function displays and selects BUFFER, turns on MODE, and 9139 refreshes a first time. 9140 9141 This function displays and optionally selects BUFFER by calling 9142 ‘magit-mode-display-buffer’ with BUFFER, MODE and SWITCH-FUNC as 9143 arguments. Then it sets the local value of 9144 ‘magit-refresh-function’ to REFRESH-FUNC and that of 9145 ‘magit-refresh-args’ to REFRESH-ARGS. Finally it creates the 9146 buffer content by calling REFRESH-FUNC with REFRESH-ARGS as 9147 arguments. 9148 9149 All arguments are evaluated before switching to BUFFER. 9150 9151 -- Function: magit-mode-display-buffer buffer mode &optional 9152 switch-function 9153 This function display BUFFER in some window and select it. BUFFER 9154 may be a buffer or a string, the name of a buffer. The buffer is 9155 returned. 9156 9157 Unless BUFFER is already displayed in the selected frame, store the 9158 previous window configuration as a buffer local value, so that it 9159 can later be restored by ‘magit-mode-bury-buffer’. 9160 9161 The buffer is displayed and selected using SWITCH-FUNCTION. If 9162 that is ‘nil’ then ‘pop-to-buffer’ is used if the current buffer’s 9163 major mode derives from ‘magit-mode’. Otherwise ‘switch-to-buffer’ 9164 is used. 9165 9166 -- Variable: magit-refresh-function 9167 The value of this buffer-local variable is the function used to 9168 refresh the current buffer. It is called with ‘magit-refresh-args’ 9169 as arguments. 9170 9171 -- Variable: magit-refresh-args 9172 The list of arguments used by ‘magit-refresh-function’ to refresh 9173 the current buffer. ‘magit-refresh-function’ is called with these 9174 arguments. 9175 9176 The value is usually set using ‘magit-mode-setup’, but in some 9177 cases it’s also useful to provide commands that can change the 9178 value. For example, the ‘magit-diff-refresh’ transient can be used 9179 to change any of the arguments used to display the diff, without 9180 having to specify again which differences should be shown, but 9181 ‘magit-diff-more-context’, ‘magit-diff-less-context’ and 9182 ‘magit-diff-default-context’ change just the ‘-U<N>’ argument. In 9183 both case this is done by changing the value of this variable and 9184 then calling this ‘magit-refresh-function’. 9185 9186 9187 File: magit.info, Node: Conventions, Prev: Refreshing Buffers, Up: Plumbing 9188 9189 10.4 Conventions 9190 ================ 9191 9192 Also see *note Completion and Confirmation::. 9193 9194 * Menu: 9195 9196 * Theming Faces:: 9197 9198 9199 File: magit.info, Node: Theming Faces, Up: Conventions 9200 9201 10.4.1 Theming Faces 9202 -------------------- 9203 9204 The default theme uses blue for local branches, green for remote 9205 branches, and goldenrod (brownish yellow) for tags. When creating a new 9206 theme, you should probably follow that example. If your theme already 9207 uses other colors, then stick to that. 9208 9209 In older releases these reference faces used to have a background 9210 color and a box around them. The basic default faces no longer do so, 9211 to make Magit buffers much less noisy, and you should follow that 9212 example at least with regards to boxes. (Boxes were used in the past to 9213 work around a conflict between the highlighting overlay and text 9214 property backgrounds. That’s no longer necessary because highlighting 9215 no longer causes other background colors to disappear.) Alternatively 9216 you can keep the background color and/or box, but then have to take 9217 special care to adjust ‘magit-branch-current’ accordingly. By default 9218 it looks mostly like ‘magit-branch-local’, but with a box (by default 9219 the former is the only face that uses a box, exactly so that it sticks 9220 out). If the former also uses a box, then you have to make sure that it 9221 differs in some other way from the latter. 9222 9223 The most difficult faces to theme are those related to diffs, 9224 headings, highlighting, and the region. There are faces that fall into 9225 all four groups - expect to spend some time getting this right. 9226 9227 The ‘region’ face in the default theme, in both the light and dark 9228 variants, as well as in many other themes, distributed with Emacs or by 9229 third-parties, is very ugly. It is common to use a background color 9230 that really sticks out, which is ugly but if that were the only problem 9231 then it would be acceptable. Unfortunately many themes also set the 9232 foreground color, which ensures that all text within the region is 9233 readable. Without doing that there might be cases where some foreground 9234 color is too close to the region background color to still be readable. 9235 But it also means that text within the region loses all syntax 9236 highlighting. 9237 9238 I consider the work that went into getting the ‘region’ face right to 9239 be a good indicator for the general quality of a theme. My 9240 recommendation for the ‘region’ face is this: use a background color 9241 slightly different from the background color of the ‘default’ face, and 9242 do not set the foreground color at all. So for a light theme you might 9243 use a light (possibly tinted) gray as the background color of ‘default’ 9244 and a somewhat darker gray for the background of ‘region’. That should 9245 usually be enough to not collide with the foreground color of any other 9246 face. But if some other faces also set a light gray as background 9247 color, then you should also make sure it doesn’t collide with those (in 9248 some cases it might be acceptable though). 9249 9250 Magit only uses the ‘region’ face when the region is "invalid" by its 9251 own definition. In a Magit buffer the region is used to either select 9252 multiple sibling sections, so that commands which support it act on all 9253 of these sections instead of just the current section, or to select 9254 lines within a single hunk section. In all other cases, the section is 9255 considered invalid and Magit won’t act on it. But such invalid sections 9256 happen, either because the user has not moved point enough yet to make 9257 it valid or because she wants to use a non-magit command to act on the 9258 region, e.g., ‘kill-region’. 9259 9260 So using the regular ‘region’ face for invalid sections is a feature. 9261 It tells the user that Magit won’t be able to act on it. It’s 9262 acceptable if that face looks a bit odd and even (but less so) if it 9263 collides with the background colors of section headings and other things 9264 that have a background color. 9265 9266 Magit highlights the current section. If a section has subsections, 9267 then all of them are highlighted. This is done using faces that have 9268 "highlight" in their names. For most sections, 9269 ‘magit-section-highlight’ is used for both the body and the heading. 9270 Like the ‘region’ face, it should only set the background color to 9271 something similar to that of ‘default’. The highlight background color 9272 must be different from both the ‘region’ background color and the 9273 ‘default’ background color. 9274 9275 For diff related sections Magit uses various faces to highlight 9276 different parts of the selected section(s). Note that hunk headings, 9277 unlike all other section headings, by default have a background color, 9278 because it is useful to have very visible separators between hunks. 9279 That face ‘magit-diff-hunk-heading’, should be different from both 9280 ‘magit-diff-hunk-heading-highlight’ and ‘magit-section-highlight’, as 9281 well as from ‘magit-diff-context’ and ‘magit-diff-context-highlight’. 9282 By default we do that by changing the foreground color. Changing the 9283 background color would lead to complications, and there are already 9284 enough we cannot get around. (Also note that it is generally a good 9285 idea for section headings to always be bold, but only for sections that 9286 have subsections). 9287 9288 When there is a valid region selecting diff-related sibling sections, 9289 i.e., multiple files or hunks, then the bodies of all these sections use 9290 the respective highlight faces, but additionally the headings instead 9291 use one of the faces ‘magit-diff-file-heading-selection’ or 9292 ‘magit-diff-hunk-heading-selection’. These faces have to be different 9293 from the regular highlight variants to provide explicit visual 9294 indication that the region is active. 9295 9296 When theming diff related faces, start by setting the option 9297 ‘magit-diff-refine-hunk’ to ‘all’. You might personally prefer to only 9298 refine the current hunk or not use hunk refinement at all, but some of 9299 the users of your theme want all hunks to be refined, so you have to 9300 cater to that. 9301 9302 (Also turn on ‘magit-diff-highlight-indentation’, 9303 ‘magit-diff-highlight-trailing’, and ‘magit-diff-paint-whitespace’; and 9304 insert some whitespace errors into the code you use for testing.) 9305 9306 For added lines you have to adjust three faces: ‘magit-diff-added’, 9307 ‘magit-diff-added-highlight’, and ‘diff-refined-added’. Make sure that 9308 the latter works well with both of the former, as well as ‘smerge-other’ 9309 and ‘diff-added’. Then do the same for the removed lines, context 9310 lines, lines added by us, and lines added by them. Also make sure the 9311 respective added, removed, and context faces use approximately the same 9312 saturation for both the highlighted and unhighlighted variants. Also 9313 make sure the file and diff headings work nicely with context lines 9314 (e.g., make them look different). Line faces should set both the 9315 foreground and the background color. For example, for added lines use 9316 two different greens. 9317 9318 It’s best if the foreground color of both the highlighted and the 9319 unhighlighted variants are the same, so you will need to have to find a 9320 color that works well on the highlight and unhighlighted background, the 9321 refine background, and the highlight context background. When there is 9322 an hunk internal region, then the added- and removed-lines background 9323 color is used only within that region. Outside the region the 9324 highlighted context background color is used. This makes it easier to 9325 see what is being staged. With an hunk internal region the hunk heading 9326 is shown using ‘magit-diff-hunk-heading-selection’, and so are the thin 9327 lines that are added around the lines that fall within the region. The 9328 background color of that has to be distinct enough from the various 9329 other involved background colors. 9330 9331 Nobody said this would be easy. If your theme restricts itself to a 9332 certain set of colors, then you should make an exception here. 9333 Otherwise it would be impossible to make the diffs look good in each and 9334 every variation. Actually you might want to just stick to the default 9335 definitions for these faces. You have been warned. Also please note 9336 that if you do not get this right, this will in some cases look to users 9337 like bugs in Magit - so please do it right or not at all. 9338 9339 9340 File: magit.info, Node: FAQ, Next: Debugging Tools, Prev: Plumbing, Up: Top 9341 9342 Appendix A FAQ 9343 ************** 9344 9345 The next two nodes lists frequently asked questions. For a list of 9346 frequently *and recently* asked questions, i.e., questions that haven’t 9347 made it into the manual yet, see 9348 <https://github.com/magit/magit/wiki/FAQ>. 9349 9350 Please also see *note Debugging Tools::. 9351 9352 * Menu: 9353 9354 * FAQ - How to ...?:: 9355 * FAQ - Issues and Errors:: 9356 9357 9358 File: magit.info, Node: FAQ - How to ...?, Next: FAQ - Issues and Errors, Up: FAQ 9359 9360 A.1 FAQ - How to ...? 9361 ===================== 9362 9363 * Menu: 9364 9365 * How to pronounce Magit?:: 9366 * How to show git's output?:: 9367 * How to install the gitman info manual?:: 9368 * How to show diffs for gpg-encrypted files?:: 9369 * How does branching and pushing work?:: 9370 * Should I disable VC?:: 9371 9372 9373 File: magit.info, Node: How to pronounce Magit?, Next: How to show git's output?, Up: FAQ - How to ...? 9374 9375 A.1.1 How to pronounce Magit? 9376 ----------------------------- 9377 9378 Either ‘mu[m's] git’ or ‘magi{c => t}’ is fine. 9379 9380 The slogan is "It’s Magit! The magical Git client", so it makes 9381 sense to pronounce Magit like magic, while taking into account that C 9382 and T do not sound the same. 9383 9384 The German "Magie" is not pronounced the same as the English "magic", 9385 so if you speak German then you can use the above rationale to justify 9386 using the former pronunciation; ‘Mag{ie => it}’. 9387 9388 You can also choose to use the former pronunciation just because you 9389 like it better. 9390 9391 Also see <https://magit.vc/assets/videos/magic.mp4>. Also see 9392 <https://emacs.stackexchange.com/questions/13696>. 9393 9394 9395 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 ...? 9396 9397 A.1.2 How to show git’s output? 9398 ------------------------------- 9399 9400 To show the output of recently run git commands, press ‘$’ (or, if that 9401 isn’t available, ‘M-x magit-process-buffer’). This will show a buffer 9402 containing a section per git invocation; as always press ‘TAB’ to expand 9403 or collapse them. 9404 9405 By default, git’s output is only inserted into the process buffer if 9406 it is run for side-effects. When the output is consumed in some way, 9407 also inserting it into the process buffer would be too expensive. For 9408 debugging purposes, it’s possible to do so anyway by setting 9409 ‘magit-git-debug’ to ‘t’. 9410 9411 9412 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 ...? 9413 9414 A.1.3 How to install the gitman info manual? 9415 -------------------------------------------- 9416 9417 Git’s manpages can be exported as an info manual called ‘gitman’. 9418 Magit’s own info manual links to nodes in that manual instead of the 9419 actual manpages because Info doesn’t support linking to manpages. 9420 9421 Unfortunately some distributions do not install the ‘gitman’ manual 9422 by default and you will have to install a separate documentation package 9423 to get it. 9424 9425 Magit patches Info adding the ability to visit links to the ‘gitman’ 9426 Info manual by instead viewing the respective manpage. If you prefer 9427 that approach, then set the value of ‘magit-view-git-manual-method’ to 9428 one of the supported packages ‘man’ or ‘woman’, e.g.: 9429 9430 (setq magit-view-git-manual-method 'man) 9431 9432 9433 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 ...? 9434 9435 A.1.4 How to show diffs for gpg-encrypted files? 9436 ------------------------------------------------ 9437 9438 Git supports showing diffs for encrypted files, but has to be told to do 9439 so. Since Magit just uses Git to get the diffs, configuring Git also 9440 affects the diffs displayed inside Magit. 9441 9442 git config --global diff.gpg.textconv "gpg --no-tty --decrypt" 9443 echo "*.gpg filter=gpg diff=gpg" > .gitattributes 9444 9445 9446 File: magit.info, Node: How does branching and pushing work?, Next: Should I disable VC?, Prev: How to show diffs for gpg-encrypted files?, Up: FAQ - How to ...? 9447 9448 A.1.5 How does branching and pushing work? 9449 ------------------------------------------ 9450 9451 Please see *note Branching:: and 9452 <https://emacsair.me/2016/01/17/magit-2.4> 9453 9454 9455 File: magit.info, Node: Should I disable VC?, Prev: How does branching and pushing work?, Up: FAQ - How to ...? 9456 9457 A.1.6 Should I disable VC? 9458 -------------------------- 9459 9460 If you don’t use VC (the built-in version control interface) then you 9461 might be tempted to disable it, not least because we used to recommend 9462 that you do that. 9463 9464 We no longer recommend that you disable VC. Doing so would break 9465 useful third-party packages (such as ‘diff-hl’), which depend on VC 9466 being enabled. 9467 9468 If you choose to disable VC anyway, then you can do so by changing 9469 the value of ‘vc-handled-backends’. 9470 9471 9472 File: magit.info, Node: FAQ - Issues and Errors, Prev: FAQ - How to ...?, Up: FAQ 9473 9474 A.2 FAQ - Issues and Errors 9475 =========================== 9476 9477 * Menu: 9478 9479 * Magit is slow:: 9480 * I changed several thousand files at once and now Magit is unusable:: 9481 * I am having problems committing:: 9482 * I am using MS Windows and cannot push with Magit:: 9483 * I am using macOS and SOMETHING works in shell, but not in Magit: I am using macOS and SOMETHING works in shell but not in Magit. 9484 * Expanding a file to show the diff causes it to disappear:: 9485 * Point is wrong in the COMMIT_EDITMSG buffer:: 9486 * The mode-line information isn't always up-to-date:: 9487 * A branch and tag sharing the same name breaks SOMETHING:: 9488 * My Git hooks work on the command-line but not inside Magit:: 9489 * git-commit-mode isn't used when committing from the command-line:: 9490 * Point ends up inside invisible text when jumping to a file-visiting buffer:: 9491 * I am no longer able to save popup defaults:: 9492 9493 9494 File: magit.info, Node: Magit is slow, Next: I changed several thousand files at once and now Magit is unusable, Up: FAQ - Issues and Errors 9495 9496 A.2.1 Magit is slow 9497 ------------------- 9498 9499 See *note Performance:: and *note I changed several thousand files at 9500 once and now Magit is unusable::. 9501 9502 9503 File: magit.info, Node: I changed several thousand files at once and now Magit is unusable, Next: I am having problems committing, Prev: Magit is slow, Up: FAQ - Issues and Errors 9504 9505 A.2.2 I changed several thousand files at once and now Magit is unusable 9506 ------------------------------------------------------------------------ 9507 9508 Magit is currently not expected to work well under such conditions. It 9509 sure would be nice if it did. Reaching satisfactory performance under 9510 such conditions will require some heavy refactoring. This is no small 9511 task but I hope to eventually find the time to make it happen. 9512 9513 But for now we recommend you use the command line to complete this 9514 one commit. Also see *note Performance::. 9515 9516 9517 File: magit.info, Node: I am having problems committing, Next: I am using MS Windows and cannot push with Magit, Prev: I changed several thousand files at once and now Magit is unusable, Up: FAQ - Issues and Errors 9518 9519 A.2.3 I am having problems committing 9520 ------------------------------------- 9521 9522 That likely means that Magit is having problems finding an appropriate 9523 emacsclient executable. See *note (with-editor)Configuring 9524 With-Editor:: and *note (with-editor)Debugging::. 9525 9526 9527 File: magit.info, Node: I am using MS Windows and cannot push with Magit, Next: I am using macOS and SOMETHING works in shell but not in Magit, Prev: I am having problems committing, Up: FAQ - Issues and Errors 9528 9529 A.2.4 I am using MS Windows and cannot push with Magit 9530 ------------------------------------------------------ 9531 9532 It’s almost certain that Magit is only incidental to this issue. It is 9533 much more likely that this is a configuration issue, even if you can 9534 push on the command line. 9535 9536 Detailed setup instructions can be found at 9537 <https://github.com/magit/magit/wiki/Pushing-with-Magit-from-Windows>. 9538 9539 9540 File: magit.info, Node: I am using macOS and SOMETHING works in shell but not in Magit, Next: Expanding a file to show the diff causes it to disappear, Prev: I am using MS Windows and cannot push with Magit, Up: FAQ - Issues and Errors 9541 9542 A.2.5 I am using macOS and SOMETHING works in shell, but not in Magit 9543 --------------------------------------------------------------------- 9544 9545 This usually occurs because Emacs doesn’t have the same environment 9546 variables as your shell. Try installing and configuring 9547 <https://github.com/purcell/exec-path-from-shell>. By default it 9548 synchronizes ‘$PATH’, which helps Magit find the same ‘git’ as the one 9549 you are using on the shell. 9550 9551 If SOMETHING is "passphrase caching with gpg-agent for commit and/or 9552 tag signing", then you’ll also need to synchronize ‘$GPG_AGENT_INFO’. 9553 9554 9555 File: magit.info, Node: Expanding a file to show the diff causes it to disappear, Next: Point is wrong in the COMMIT_EDITMSG buffer, Prev: I am using macOS and SOMETHING works in shell but not in Magit, Up: FAQ - Issues and Errors 9556 9557 A.2.6 Expanding a file to show the diff causes it to disappear 9558 -------------------------------------------------------------- 9559 9560 This is probably caused by a customization of a ‘diff.*’ Git variable. 9561 You probably set that variable for a reason, and should therefore only 9562 undo that setting in Magit by customizing ‘magit-git-global-arguments’. 9563 9564 9565 File: magit.info, Node: Point is wrong in the COMMIT_EDITMSG buffer, Next: The mode-line information isn't always up-to-date, Prev: Expanding a file to show the diff causes it to disappear, Up: FAQ - Issues and Errors 9566 9567 A.2.7 Point is wrong in the ‘COMMIT_EDITMSG’ buffer 9568 --------------------------------------------------- 9569 9570 Neither Magit nor ‘git-commit.el’ fiddle with point in the buffer used 9571 to write commit messages, so something else must be doing it. 9572 9573 You have probably globally enabled a mode which restores point in 9574 file-visiting buffers. It might be a bit surprising, but when you write 9575 a commit message, then you are actually editing a file. 9576 9577 So you have to figure out which package is doing it. ‘saveplace’, 9578 ‘pointback’, and ‘session’ are likely candidates. These snippets might 9579 help: 9580 9581 (setq session-name-disable-regexp "\\(?:\\`'\\.git/[A-Z_]+\\'\\)") 9582 9583 (with-eval-after-load 'pointback 9584 (lambda () 9585 (when (or git-commit-mode git-rebase-mode) 9586 (pointback-mode -1)))) 9587 9588 9589 File: magit.info, Node: The mode-line information isn't always up-to-date, Next: A branch and tag sharing the same name breaks SOMETHING, Prev: Point is wrong in the COMMIT_EDITMSG buffer, Up: FAQ - Issues and Errors 9590 9591 A.2.8 The mode-line information isn’t always up-to-date 9592 ------------------------------------------------------- 9593 9594 Magit is not responsible for the version control information that is 9595 being displayed in the mode-line and looks something like ‘Git-master’. 9596 The built-in "Version Control" package, also known as "VC", updates that 9597 information, and can be told to do so more often: 9598 9599 (setq auto-revert-check-vc-info t) 9600 9601 But doing so isn’t good for performance. For more (overly 9602 optimistic) information see *note (emacs)VC Mode Line::. 9603 9604 If you don’t really care about seeing this information in the 9605 mode-line, but just don’t want to see _incorrect_ information, then 9606 consider simply not displaying it in the mode-line: 9607 9608 (setq-default mode-line-format 9609 (delete '(vc-mode vc-mode) mode-line-format)) 9610 9611 9612 File: magit.info, Node: A branch and tag sharing the same name breaks SOMETHING, Next: My Git hooks work on the command-line but not inside Magit, Prev: The mode-line information isn't always up-to-date, Up: FAQ - Issues and Errors 9613 9614 A.2.9 A branch and tag sharing the same name breaks SOMETHING 9615 ------------------------------------------------------------- 9616 9617 Or more generally, ambiguous refnames break SOMETHING. 9618 9619 Magit assumes that refs are named non-ambiguously across the 9620 "refs/heads/", "refs/tags/", and "refs/remotes/" namespaces (i.e., all 9621 the names remain unique when those prefixes are stripped). We consider 9622 ambiguous refnames unsupported and recommend that you use a 9623 non-ambiguous naming scheme. However, if you do work with a repository 9624 that has ambiguous refnames, please report any issues you encounter, so 9625 that we can investigate whether there is a simple fix. 9626 9627 9628 File: magit.info, Node: My Git hooks work on the command-line but not inside Magit, Next: git-commit-mode isn't used when committing from the command-line, Prev: A branch and tag sharing the same name breaks SOMETHING, Up: FAQ - Issues and Errors 9629 9630 A.2.10 My Git hooks work on the command-line but not inside Magit 9631 ----------------------------------------------------------------- 9632 9633 When Magit calls ‘git’ it adds a few global arguments including 9634 ‘--literal-pathspecs’ and the ‘git’ process started by Magit then passes 9635 that setting on to other ‘git’ process it starts itself. It does so by 9636 setting the environment variable ‘GIT_LITERAL_PATHSPECS’, not by calling 9637 subprocesses with the ‘--literal-pathspecs’ argument. You can therefore 9638 override this setting in hook scripts using ‘unset 9639 GIT_LITERAL_PATHSPECS’. 9640 9641 9642 File: magit.info, Node: git-commit-mode isn't used when committing from the command-line, Next: Point ends up inside invisible text when jumping to a file-visiting buffer, Prev: My Git hooks work on the command-line but not inside Magit, Up: FAQ - Issues and Errors 9643 9644 A.2.11 ‘git-commit-mode’ isn’t used when committing from the command-line 9645 ------------------------------------------------------------------------- 9646 9647 The reason for this is that ‘git-commit.el’ has not been loaded yet 9648 and/or that the server has not been started yet. These things have 9649 always already been taken care of when you commit from Magit because in 9650 order to do so, Magit has to be loaded and doing that involves loading 9651 ‘git-commit’ and starting the server. 9652 9653 If you want to commit from the command-line, then you have to take 9654 care of these things yourself. Your ‘init.el’ file should contain: 9655 9656 (require 'git-commit) 9657 (server-mode) 9658 9659 Instead of ‘(require ’git-commit)‘ you may also use: 9660 9661 (load "/path/to/magit-autoloads.el") 9662 9663 You might want to do that because loading ‘git-commit’ causes large 9664 parts of Magit to be loaded. 9665 9666 There are also some variations of ‘(server-mode)’ that you might want 9667 to try. Personally I use: 9668 9669 (use-package server 9670 :config (or (server-running-p) (server-mode))) 9671 9672 Now you can use: 9673 9674 $ emacs& 9675 $ EDITOR=emacsclient git commit 9676 9677 However you cannot use: 9678 9679 $ killall emacs 9680 $ EDITOR="emacsclient --alternate-editor emacs" git commit 9681 9682 This will actually end up using ‘emacs’, not ‘emacsclient’. If you 9683 do this, then you can still edit the commit message but 9684 ‘git-commit-mode’ won’t be used and you have to exit ‘emacs’ to finish 9685 the process. 9686 9687 Tautology ahead. If you want to be able to use ‘emacsclient’ to 9688 connect to a running ‘emacs’ instance, even though no ‘emacs’ instance 9689 is running, then you cannot use ‘emacsclient’ directly. 9690 9691 Instead you have to create a script that does something like this: 9692 9693 Try to use ‘emacsclient’ (without using ‘--alternate-editor’). If 9694 that succeeds, do nothing else. Otherwise start ‘emacs &’ (and 9695 ‘init.el’ must call ‘server-start’) and try to use ‘emacsclient’ again. 9696 9697 9698 File: magit.info, Node: Point ends up inside invisible text when jumping to a file-visiting buffer, Next: I am no longer able to save popup defaults, Prev: git-commit-mode isn't used when committing from the command-line, Up: FAQ - Issues and Errors 9699 9700 A.2.12 Point ends up inside invisible text when jumping to a file-visiting buffer 9701 --------------------------------------------------------------------------------- 9702 9703 This can happen when you type ‘RET’ on a hunk to visit the respective 9704 file at the respective position. One solution to this problem is to use 9705 ‘global-reveal-mode’. It makes sure that text around point is always 9706 visible. If that is too drastic for your taste, then you may instead 9707 use ‘magit-diff-visit-file-hook’ to reveal the text, possibly using 9708 ‘reveal-post-command’ or for Org buffers ‘org-reveal’. 9709 9710 9711 File: magit.info, Node: I am no longer able to save popup defaults, Prev: Point ends up inside invisible text when jumping to a file-visiting buffer, Up: FAQ - Issues and Errors 9712 9713 A.2.13 I am no longer able to save popup defaults 9714 ------------------------------------------------- 9715 9716 Magit used to use Magit-Popup to implement the transient popup menus. 9717 Now it used Transient instead, which is Magit-Popup’s successor. 9718 9719 In the older Magit-Popup menus, it was possible to save user settings 9720 (e.g., setting the gpg signing key for commits) by using ‘C-c C-c’ in 9721 the popup buffer. This would dismiss the popup, but save the settings 9722 as the defaults for future popups. 9723 9724 When switching to Transient menus, this functionality is now 9725 available via ‘C-x C-s’ instead; the ‘C-x’ prefix has other options as 9726 well when using Transient, which will be displayed when it is typed. 9727 See <https://magit.vc/manual/transient/Saving-Values.html#Saving-Values> 9728 for more details. 9729 9730 9731 File: magit.info, Node: Debugging Tools, Next: Keystroke Index, Prev: FAQ, Up: Top 9732 9733 B Debugging Tools 9734 ***************** 9735 9736 Magit and its dependencies provide a few debugging tools, and we 9737 appreciate it very much if you use those tools before reporting an 9738 issue. Please include all relevant output when reporting an issue. 9739 9740 ‘M-x magit-version’ 9741 This command shows the currently used versions of Magit, Git, and 9742 Emacs in the echo area. Non-interactively this just returns the 9743 Magit version. 9744 9745 ‘M-x magit-emacs-Q-command’ 9746 This command shows a debugging shell command in the echo area and 9747 adds it to the kill ring. Paste that command into a shell and run 9748 it. 9749 9750 This shell command starts ‘emacs’ with only ‘magit’ and its 9751 dependencies loaded. Neither your configuration nor other 9752 installed packages are loaded. This makes it easier to determine 9753 whether some issue lays with Magit or something else. 9754 9755 If you run Magit from its Git repository, then you should be able 9756 to use ‘make emacs-Q’ instead of the output of this command. 9757 9758 ‘M-x magit-toggle-git-debug’ 9759 This command toggles whether additional git errors are reported. 9760 9761 Magit basically calls git for one of these two reasons: for 9762 side-effects or to do something with its standard output. 9763 9764 When git is run for side-effects then its output, including error 9765 messages, go into the process buffer which is shown when using ‘$’. 9766 9767 When git’s output is consumed in some way, then it would be too 9768 expensive to also insert it into this buffer, but when this option 9769 is non-nil and git returns with a non-zero exit status, then at 9770 least its standard error is inserted into this buffer. 9771 9772 This is only intended for debugging purposes. Do not enable this 9773 permanently, that would negatively affect performance. Also note 9774 that just because git exits with a non-zero exit status and prints 9775 an error message that usually doesn’t mean that it is an error as 9776 far as Magit is concerned, which is another reason we usually hide 9777 these error messages. Whether some error message is relevant in 9778 the context of some unexpected behavior has to be judged on a case 9779 by case basis. 9780 9781 ‘M-x magit-toggle-verbose-refresh’ 9782 This command toggles whether Magit refreshes buffers verbosely. 9783 Enabling this helps figuring out which sections are bottlenecks. 9784 The additional output can be found in the ‘*Messages*’ buffer. 9785 9786 ‘M-x magit-debug-git-executable’ 9787 This command displays a buffer containing information about the 9788 available and used ‘git’ executable(s), and can be useful when 9789 investigating ‘exec-path’ issues. 9790 9791 Also see *note Git Executable::. 9792 9793 ‘M-x with-editor-debug’ 9794 This command displays a buffer containing information about the 9795 available and used ‘emacsclient’ executable(s), and can be useful 9796 when investigating why Magit (or rather ‘with-editor’) cannot find 9797 an appropriate ‘emacsclient’ executable. 9798 9799 Also see *note (with-editor)Debugging::. 9800 9801 Please also see *note FAQ::. 9802 9803 9804 File: magit.info, Node: Keystroke Index, Next: Function and Command Index, Prev: Debugging Tools, Up: Top 9805 9806 Appendix C Keystroke Index 9807 ************************** 9808 9809 9810 * Menu: 9811 9812 * !: Running Git Manually. 9813 (line 13) 9814 * ! !: Running Git Manually. 9815 (line 17) 9816 * ! a: Running Git Manually. 9817 (line 53) 9818 * ! b: Running Git Manually. 9819 (line 56) 9820 * ! g: Running Git Manually. 9821 (line 59) 9822 * ! k: Running Git Manually. 9823 (line 50) 9824 * ! m: Running Git Manually. 9825 (line 62) 9826 * ! p: Running Git Manually. 9827 (line 25) 9828 * ! s: Running Git Manually. 9829 (line 34) 9830 * ! S: Running Git Manually. 9831 (line 38) 9832 * $: Viewing Git Output. (line 17) 9833 * +: Log Buffer. (line 64) 9834 * + <1>: Refreshing Diffs. (line 65) 9835 * -: Log Buffer. (line 67) 9836 * - <1>: Refreshing Diffs. (line 62) 9837 * 0: Refreshing Diffs. (line 68) 9838 * 1: Section Visibility. (line 39) 9839 * 2: Section Visibility. (line 39) 9840 * 3: Section Visibility. (line 39) 9841 * 4: Section Visibility. (line 39) 9842 * 5: Repository List. (line 115) 9843 * :: Running Git Manually. 9844 (line 25) 9845 * =: Log Buffer. (line 59) 9846 * >: Sparse checkouts. (line 17) 9847 * > a: Sparse checkouts. (line 39) 9848 * > d: Sparse checkouts. (line 50) 9849 * > e: Sparse checkouts. (line 21) 9850 * > r: Sparse checkouts. (line 44) 9851 * > s: Sparse checkouts. (line 33) 9852 * ^: Section Movement. (line 28) 9853 * a: Applying. (line 34) 9854 * A: Cherry Picking. (line 9) 9855 * A A: Cherry Picking. (line 17) 9856 * A a: Cherry Picking. (line 23) 9857 * A A <1>: Cherry Picking. (line 85) 9858 * A a <1>: Cherry Picking. (line 91) 9859 * A d: Cherry Picking. (line 51) 9860 * A h: Cherry Picking. (line 40) 9861 * A n: Cherry Picking. (line 62) 9862 * A s: Cherry Picking. (line 72) 9863 * A s <1>: Cherry Picking. (line 88) 9864 * B: Bisecting. (line 9) 9865 * b: Blaming. (line 115) 9866 * b <1>: Branch Commands. (line 13) 9867 * b <2>: Editing Rebase Sequences. 9868 (line 70) 9869 * B B: Bisecting. (line 16) 9870 * B b: Bisecting. (line 32) 9871 * b b: Branch Commands. (line 47) 9872 * b C: Branch Commands. (line 31) 9873 * b c: Branch Commands. (line 63) 9874 * B g: Bisecting. (line 36) 9875 * B k: Bisecting. (line 46) 9876 * b k: Branch Commands. (line 138) 9877 * b l: Branch Commands. (line 69) 9878 * B m: Bisecting. (line 40) 9879 * b m: Branch Commands. (line 149) 9880 * b n: Branch Commands. (line 54) 9881 * B r: Bisecting. (line 51) 9882 * B s: Bisecting. (line 26) 9883 * b s: Branch Commands. (line 91) 9884 * b S: Branch Commands. (line 118) 9885 * b x: Branch Commands. (line 123) 9886 * c: Blaming. (line 141) 9887 * C: Cloning Repository. (line 20) 9888 * c <1>: Initiating a Commit. (line 9) 9889 * c <2>: Editing Rebase Sequences. 9890 (line 59) 9891 * C >: Cloning Repository. (line 38) 9892 * c a: Initiating a Commit. (line 18) 9893 * c A: Initiating a Commit. (line 59) 9894 * C b: Cloning Repository. (line 44) 9895 * C C: Cloning Repository. (line 28) 9896 * c c: Initiating a Commit. (line 14) 9897 * C d: Cloning Repository. (line 55) 9898 * C e: Cloning Repository. (line 61) 9899 * c e: Initiating a Commit. (line 21) 9900 * c f: Initiating a Commit. (line 39) 9901 * c F: Initiating a Commit. (line 46) 9902 * C m: Cloning Repository. (line 48) 9903 * C s: Cloning Repository. (line 32) 9904 * c s: Initiating a Commit. (line 49) 9905 * c S: Initiating a Commit. (line 56) 9906 * c w: Initiating a Commit. (line 30) 9907 * C-<return>: Visiting Files and Blobs from a Diff. 9908 (line 50) 9909 * C-<tab>: Section Visibility. (line 14) 9910 * C-c C-a: Commit Pseudo Headers. 9911 (line 16) 9912 * C-c C-b: Log Buffer. (line 20) 9913 * C-c C-b <1>: Refreshing Diffs. (line 84) 9914 * C-c C-c: Select from Log. (line 21) 9915 * C-c C-c <1>: Editing Commit Messages. 9916 (line 18) 9917 * C-c C-c <2>: Editing Rebase Sequences. 9918 (line 7) 9919 * C-c C-d: Refreshing Diffs. (line 75) 9920 * C-c C-d <1>: Editing Commit Messages. 9921 (line 54) 9922 * C-c C-e: Commands Available in Diffs. 9923 (line 24) 9924 * C-c C-f: Log Buffer. (line 23) 9925 * C-c C-f <1>: Refreshing Diffs. (line 87) 9926 * C-c C-i: Commit Pseudo Headers. 9927 (line 13) 9928 * C-c C-k: Select from Log. (line 26) 9929 * C-c C-k <1>: Editing Commit Messages. 9930 (line 22) 9931 * C-c C-k <2>: Editing Rebase Sequences. 9932 (line 11) 9933 * C-c C-n: Log Buffer. (line 26) 9934 * C-c C-o: Commit Pseudo Headers. 9935 (line 28) 9936 * C-c C-p: Commit Pseudo Headers. 9937 (line 31) 9938 * C-c C-r: Commit Pseudo Headers. 9939 (line 19) 9940 * C-c C-s: Commit Pseudo Headers. 9941 (line 22) 9942 * C-c C-t: Commands Available in Diffs. 9943 (line 15) 9944 * C-c C-t <1>: Commit Pseudo Headers. 9945 (line 25) 9946 * C-c C-w: Using the Revision Stack. 9947 (line 7) 9948 * C-c f: Commands for Buffers Visiting Files. 9949 (line 52) 9950 * C-c f , c: Commands for Buffers Visiting Files. 9951 (line 52) 9952 * C-c f , k: Commands for Buffers Visiting Files. 9953 (line 52) 9954 * C-c f , r: Commands for Buffers Visiting Files. 9955 (line 52) 9956 * C-c f , x: Commands for Buffers Visiting Files. 9957 (line 52) 9958 * C-c f B: Blaming. (line 28) 9959 * C-c f b: Blaming. (line 28) 9960 * C-c f B <1>: Commands for Buffers Visiting Files. 9961 (line 52) 9962 * C-c f b <1>: Commands for Buffers Visiting Files. 9963 (line 52) 9964 * C-c f B b: Blaming. (line 28) 9965 * C-c f B e: Blaming. (line 28) 9966 * C-c f B f: Blaming. (line 28) 9967 * C-c f B q: Blaming. (line 28) 9968 * C-c f B r: Blaming. (line 28) 9969 * C-c f c: Commands for Buffers Visiting Files. 9970 (line 52) 9971 * C-c f D: Commands for Buffers Visiting Files. 9972 (line 52) 9973 * C-c f d: Commands for Buffers Visiting Files. 9974 (line 52) 9975 * C-c f e: Blaming. (line 28) 9976 * C-c f e <1>: Commands for Buffers Visiting Files. 9977 (line 52) 9978 * C-c f f: Blaming. (line 28) 9979 * C-c f f <1>: Commands for Buffers Visiting Files. 9980 (line 52) 9981 * C-c f g: Commands for Buffers Visiting Files. 9982 (line 52) 9983 * C-c f G: Commands for Buffers Visiting Files. 9984 (line 52) 9985 * C-c f L: Commands for Buffers Visiting Files. 9986 (line 52) 9987 * C-c f l: Commands for Buffers Visiting Files. 9988 (line 52) 9989 * C-c f M: Commands for Buffers Visiting Files. 9990 (line 52) 9991 * C-c f m: Commands for Buffers Visiting Files. 9992 (line 52) 9993 * C-c f n: Commands for Buffers Visiting Files. 9994 (line 52) 9995 * C-c f p: Commands for Buffers Visiting Files. 9996 (line 52) 9997 * C-c f q: Blaming. (line 28) 9998 * C-c f q <1>: Commands for Buffers Visiting Files. 9999 (line 52) 10000 * C-c f r: Blaming. (line 28) 10001 * C-c f r <1>: Commands for Buffers Visiting Files. 10002 (line 52) 10003 * C-c f s: Commands for Buffers Visiting Files. 10004 (line 52) 10005 * C-c f s <1>: Commands for Buffers Visiting Files. 10006 (line 52) 10007 * C-c f t: Commands for Buffers Visiting Files. 10008 (line 52) 10009 * C-c f u: Commands for Buffers Visiting Files. 10010 (line 52) 10011 * C-c f u <1>: Commands for Buffers Visiting Files. 10012 (line 52) 10013 * C-c f v: Commands for Buffers Visiting Files. 10014 (line 52) 10015 * C-c f V: Commands for Buffers Visiting Files. 10016 (line 52) 10017 * C-c g: Transient Commands. (line 20) 10018 * C-c M-g: Commands for Buffers Visiting Files. 10019 (line 58) 10020 * C-c M-g , c: Commands for Buffers Visiting Files. 10021 (line 86) 10022 * C-c M-g , k: Commands for Buffers Visiting Files. 10023 (line 82) 10024 * C-c M-g , r: Commands for Buffers Visiting Files. 10025 (line 78) 10026 * C-c M-g , x: Commands for Buffers Visiting Files. 10027 (line 74) 10028 * C-c M-g B: Blaming. (line 34) 10029 * C-c M-g b: Blaming. (line 45) 10030 * C-c M-g B <1>: Commands for Buffers Visiting Files. 10031 (line 137) 10032 * C-c M-g B b: Blaming. (line 45) 10033 * C-c M-g B e: Blaming. (line 76) 10034 * C-c M-g B f: Blaming. (line 68) 10035 * C-c M-g B q: Blaming. (line 87) 10036 * C-c M-g B r: Blaming. (line 60) 10037 * C-c M-g c: Commands for Buffers Visiting Files. 10038 (line 176) 10039 * C-c M-g D: Commands for Buffers Visiting Files. 10040 (line 91) 10041 * C-c M-g d: Commands for Buffers Visiting Files. 10042 (line 101) 10043 * C-c M-g e: Blaming. (line 76) 10044 * C-c M-g e <1>: Commands for Buffers Visiting Files. 10045 (line 182) 10046 * C-c M-g f: Blaming. (line 68) 10047 * C-c M-g g: Commands for Buffers Visiting Files. 10048 (line 166) 10049 * C-c M-g G: Commands for Buffers Visiting Files. 10050 (line 172) 10051 * C-c M-g L: Commands for Buffers Visiting Files. 10052 (line 109) 10053 * C-c M-g l: Commands for Buffers Visiting Files. 10054 (line 119) 10055 * C-c M-g M: Commands for Buffers Visiting Files. 10056 (line 132) 10057 * C-c M-g n: Commands for Buffers Visiting Files. 10058 (line 153) 10059 * C-c M-g p: Commands for Buffers Visiting Files. 10060 (line 149) 10061 * C-c M-g q: Blaming. (line 87) 10062 * C-c M-g r: Blaming. (line 60) 10063 * C-c M-g s: Commands for Buffers Visiting Files. 10064 (line 63) 10065 * C-c M-g s <1>: Commands for Buffers Visiting Files. 10066 (line 63) 10067 * C-c M-g t: Commands for Buffers Visiting Files. 10068 (line 129) 10069 * C-c M-g u: Commands for Buffers Visiting Files. 10070 (line 69) 10071 * C-c M-g u <1>: Commands for Buffers Visiting Files. 10072 (line 69) 10073 * C-c M-g v: Commands for Buffers Visiting Files. 10074 (line 156) 10075 * C-c M-g V: Commands for Buffers Visiting Files. 10076 (line 160) 10077 * C-c M-i: Commit Pseudo Headers. 10078 (line 35) 10079 * C-c M-s: Editing Commit Messages. 10080 (line 33) 10081 * C-c TAB: Section Visibility. (line 14) 10082 * C-w: Common Commands. (line 22) 10083 * C-x g: Status Buffer. (line 23) 10084 * C-x M-g: Transient Commands. (line 20) 10085 * C-x u: Editing Rebase Sequences. 10086 (line 77) 10087 * d: Diffing. (line 22) 10088 * D: Refreshing Diffs. (line 16) 10089 * d c: Diffing. (line 63) 10090 * d d: Diffing. (line 27) 10091 * D f: Refreshing Diffs. (line 45) 10092 * D F: Refreshing Diffs. (line 49) 10093 * D g: Refreshing Diffs. (line 21) 10094 * d p: Diffing. (line 56) 10095 * d r: Diffing. (line 30) 10096 * D r: Refreshing Diffs. (line 41) 10097 * d s: Diffing. (line 48) 10098 * D s: Refreshing Diffs. (line 25) 10099 * d t: Diffing. (line 67) 10100 * D t: Refreshing Diffs. (line 38) 10101 * d u: Diffing. (line 53) 10102 * d w: Diffing. (line 43) 10103 * D w: Refreshing Diffs. (line 31) 10104 * DEL: Log Buffer. (line 50) 10105 * DEL <1>: Commands Available in Diffs. 10106 (line 56) 10107 * DEL <2>: Blaming. (line 103) 10108 * DEL <3>: Editing Rebase Sequences. 10109 (line 25) 10110 * e: Ediffing. (line 10) 10111 * E: Ediffing. (line 21) 10112 * e <1>: Editing Rebase Sequences. 10113 (line 46) 10114 * E c: Ediffing. (line 100) 10115 * E i: Ediffing. (line 94) 10116 * E m: Ediffing. (line 33) 10117 * E M: Ediffing. (line 48) 10118 * E r: Ediffing. (line 25) 10119 * E s: Ediffing. (line 87) 10120 * E t: Ediffing. (line 79) 10121 * E u: Ediffing. (line 91) 10122 * E w: Ediffing. (line 97) 10123 * E z: Ediffing. (line 103) 10124 * f: Repository List. (line 111) 10125 * f <1>: Editing Rebase Sequences. 10126 (line 52) 10127 * f <2>: Fetching. (line 10) 10128 * F: Pulling. (line 10) 10129 * f a: Fetching. (line 45) 10130 * f C: Branch Commands. (line 31) 10131 * F C: Branch Commands. (line 31) 10132 * f e: Fetching. (line 34) 10133 * F e: Pulling. (line 28) 10134 * f m: Fetching. (line 48) 10135 * f o: Fetching. (line 37) 10136 * f p: Fetching. (line 15) 10137 * F p: Pulling. (line 14) 10138 * f r: Fetching. (line 41) 10139 * f u: Fetching. (line 22) 10140 * F u: Pulling. (line 21) 10141 * g: Automatic Refreshing of Magit Buffers. 10142 (line 26) 10143 * G: Automatic Refreshing of Magit Buffers. 10144 (line 34) 10145 * H: Section Types and Values. 10146 (line 14) 10147 * I: Creating Repository. (line 7) 10148 * j: Log Buffer. (line 31) 10149 * j <1>: Commands Available in Diffs. 10150 (line 43) 10151 * k: Viewing Git Output. (line 24) 10152 * k <1>: Applying. (line 40) 10153 * k <2>: Editing Rebase Sequences. 10154 (line 56) 10155 * k <3>: Stashing. (line 128) 10156 * l: Logging. (line 28) 10157 * L: Refreshing Logs. (line 12) 10158 * L <1>: Log Buffer. (line 7) 10159 * L <2>: Log Margin. (line 52) 10160 * l <1>: Editing Rebase Sequences. 10161 (line 94) 10162 * l a: Logging. (line 59) 10163 * l b: Logging. (line 56) 10164 * L d: Log Margin. (line 66) 10165 * L g: Refreshing Logs. (line 17) 10166 * l h: Logging. (line 38) 10167 * l H: Reflog. (line 18) 10168 * l l: Logging. (line 33) 10169 * l L: Logging. (line 53) 10170 * L L: Refreshing Logs. (line 34) 10171 * L L <1>: Log Margin. (line 60) 10172 * L l: Log Margin. (line 63) 10173 * l o: Logging. (line 47) 10174 * l O: Reflog. (line 15) 10175 * l r: Reflog. (line 12) 10176 * L s: Refreshing Logs. (line 21) 10177 * l u: Logging. (line 41) 10178 * L w: Refreshing Logs. (line 27) 10179 * m: Repository List. (line 105) 10180 * m <1>: Merging. (line 10) 10181 * M: Remote Commands. (line 14) 10182 * m a: Merging. (line 42) 10183 * m a <1>: Merging. (line 91) 10184 * M a: Remote Commands. (line 48) 10185 * M C: Remote Commands. (line 32) 10186 * m e: Merging. (line 30) 10187 * m i: Merging. (line 54) 10188 * M k: Remote Commands. (line 60) 10189 * m m: Merging. (line 18) 10190 * m m <1>: Merging. (line 86) 10191 * m n: Merging. (line 36) 10192 * m p: Merging. (line 75) 10193 * M p: Remote Commands. (line 63) 10194 * M P: Remote Commands. (line 67) 10195 * M r: Remote Commands. (line 52) 10196 * m s: Merging. (line 67) 10197 * M u: Remote Commands. (line 56) 10198 * M-1: Section Visibility. (line 45) 10199 * M-2: Section Visibility. (line 45) 10200 * M-3: Section Visibility. (line 45) 10201 * M-4: Section Visibility. (line 45) 10202 * M-<tab>: Section Visibility. (line 29) 10203 * M-n: Section Movement. (line 24) 10204 * M-n <1>: Editing Commit Messages. 10205 (line 41) 10206 * M-n <2>: Editing Rebase Sequences. 10207 (line 40) 10208 * M-p: Section Movement. (line 19) 10209 * M-p <1>: Editing Commit Messages. 10210 (line 36) 10211 * M-p <2>: Editing Rebase Sequences. 10212 (line 37) 10213 * M-w: Blaming. (line 134) 10214 * M-w <1>: Common Commands. (line 39) 10215 * MM: Editing Rebase Sequences. 10216 (line 102) 10217 * Mt: Editing Rebase Sequences. 10218 (line 108) 10219 * n: Section Movement. (line 16) 10220 * n <1>: Blaming. (line 118) 10221 * N: Blaming. (line 121) 10222 * n <2>: Editing Rebase Sequences. 10223 (line 34) 10224 * n <3>: Minor Mode for Buffers Visiting Blobs. 10225 (line 16) 10226 * o: Submodule Transient. (line 7) 10227 * O: Subtree. (line 9) 10228 * o a: Submodule Transient. (line 20) 10229 * o d: Submodule Transient. (line 45) 10230 * O e: Subtree. (line 37) 10231 * O e p: Subtree. (line 48) 10232 * O e s: Subtree. (line 52) 10233 * o f: Submodule Transient. (line 51) 10234 * O i: Subtree. (line 13) 10235 * O i a: Subtree. (line 24) 10236 * O i c: Subtree. (line 28) 10237 * O i f: Subtree. (line 34) 10238 * O i m: Subtree. (line 31) 10239 * o l: Submodule Transient. (line 48) 10240 * o p: Submodule Transient. (line 32) 10241 * o r: Submodule Transient. (line 26) 10242 * o s: Submodule Transient. (line 40) 10243 * o u: Submodule Transient. (line 36) 10244 * p: Section Movement. (line 11) 10245 * p <1>: Blaming. (line 124) 10246 * P: Blaming. (line 127) 10247 * p <2>: Editing Rebase Sequences. 10248 (line 31) 10249 * P <1>: Pushing. (line 10) 10250 * p <3>: Minor Mode for Buffers Visiting Blobs. 10251 (line 13) 10252 * P C: Branch Commands. (line 31) 10253 * P e: Pushing. (line 29) 10254 * P m: Pushing. (line 45) 10255 * P o: Pushing. (line 33) 10256 * P p: Pushing. (line 15) 10257 * P r: Pushing. (line 37) 10258 * P t: Pushing. (line 52) 10259 * P T: Pushing. (line 59) 10260 * P u: Pushing. (line 22) 10261 * q: Quitting Windows. (line 7) 10262 * q <1>: Log Buffer. (line 14) 10263 * q <2>: Blaming. (line 130) 10264 * q <3>: Minor Mode for Buffers Visiting Blobs. 10265 (line 19) 10266 * r: Rebasing. (line 10) 10267 * r <1>: Editing Rebase Sequences. 10268 (line 43) 10269 * r a: Rebasing. (line 111) 10270 * r e: Rebasing. (line 42) 10271 * r e <1>: Rebasing. (line 107) 10272 * r f: Rebasing. (line 79) 10273 * r i: Rebasing. (line 76) 10274 * r k: Rebasing. (line 91) 10275 * r m: Rebasing. (line 83) 10276 * r p: Rebasing. (line 28) 10277 * r r: Rebasing. (line 97) 10278 * r s: Rebasing. (line 47) 10279 * r s <1>: Rebasing. (line 103) 10280 * r u: Rebasing. (line 35) 10281 * r w: Rebasing. (line 87) 10282 * RET: Repository List. (line 102) 10283 * RET <1>: References Buffer. (line 159) 10284 * RET <2>: Visiting Files and Blobs from a Diff. 10285 (line 9) 10286 * RET <3>: Blaming. (line 91) 10287 * RET <4>: Editing Rebase Sequences. 10288 (line 15) 10289 * s: Staging and Unstaging. 10290 (line 29) 10291 * S: Staging and Unstaging. 10292 (line 36) 10293 * s <1>: Editing Rebase Sequences. 10294 (line 49) 10295 * S-<tab>: Section Visibility. (line 33) 10296 * SPC: Log Buffer. (line 41) 10297 * SPC <1>: Commands Available in Diffs. 10298 (line 53) 10299 * SPC <2>: Blaming. (line 94) 10300 * SPC <3>: Editing Rebase Sequences. 10301 (line 19) 10302 * t: Editing Rebase Sequences. 10303 (line 97) 10304 * t <1>: Tagging. (line 9) 10305 * T: Notes. (line 9) 10306 * T a: Notes. (line 47) 10307 * T c: Notes. (line 43) 10308 * t k: Tagging. (line 37) 10309 * T m: Notes. (line 35) 10310 * t p: Tagging. (line 43) 10311 * T p: Notes. (line 28) 10312 * t r: Tagging. (line 18) 10313 * T r: Notes. (line 21) 10314 * t t: Tagging. (line 14) 10315 * T T: Notes. (line 14) 10316 * TAB: Section Visibility. (line 10) 10317 * u: Repository List. (line 108) 10318 * u <1>: Staging and Unstaging. 10319 (line 42) 10320 * U: Staging and Unstaging. 10321 (line 50) 10322 * v: Applying. (line 47) 10323 * V: Reverting. (line 7) 10324 * V a: Reverting. (line 35) 10325 * V s: Reverting. (line 32) 10326 * V V: Reverting. (line 15) 10327 * V v: Reverting. (line 20) 10328 * V V <1>: Reverting. (line 29) 10329 * W: Plain Patches. (line 7) 10330 * w: Maildir Patches. (line 9) 10331 * w a: Plain Patches. (line 20) 10332 * w a <1>: Maildir Patches. (line 23) 10333 * w a <2>: Maildir Patches. (line 38) 10334 * W c: Plain Patches. (line 12) 10335 * w m: Maildir Patches. (line 20) 10336 * W s: Plain Patches. (line 26) 10337 * w s: Maildir Patches. (line 34) 10338 * w w: Maildir Patches. (line 14) 10339 * w w <1>: Maildir Patches. (line 31) 10340 * x: Editing Rebase Sequences. 10341 (line 62) 10342 * x <1>: Resetting. (line 9) 10343 * X f: Resetting. (line 44) 10344 * X h: Resetting. (line 24) 10345 * X i: Resetting. (line 33) 10346 * X k: Resetting. (line 28) 10347 * X m: Resetting. (line 15) 10348 * X s: Resetting. (line 19) 10349 * X w: Resetting. (line 39) 10350 * X w <1>: Wip Modes. (line 64) 10351 * Y: Cherries. (line 18) 10352 * y: References Buffer. (line 7) 10353 * y <1>: Editing Rebase Sequences. 10354 (line 74) 10355 * y c: References Buffer. (line 25) 10356 * y o: References Buffer. (line 30) 10357 * y r: References Buffer. (line 34) 10358 * y y: References Buffer. (line 21) 10359 * z: Stashing. (line 9) 10360 * Z: Worktree. (line 9) 10361 * z a: Stashing. (line 52) 10362 * z b: Stashing. (line 115) 10363 * z B: Stashing. (line 120) 10364 * Z b: Worktree. (line 13) 10365 * Z c: Worktree. (line 16) 10366 * z f: Stashing. (line 125) 10367 * Z g: Worktree. (line 26) 10368 * z i: Stashing. (line 20) 10369 * z I: Stashing. (line 42) 10370 * z k: Stashing. (line 108) 10371 * Z k: Worktree. (line 22) 10372 * z l: Stashing. (line 131) 10373 * Z m: Worktree. (line 19) 10374 * z p: Stashing. (line 79) 10375 * z v: Stashing. (line 112) 10376 * z w: Stashing. (line 24) 10377 * z W: Stashing. (line 46) 10378 * z x: Stashing. (line 30) 10379 * z z: Stashing. (line 14) 10380 * z Z: Stashing. (line 36) 10381 10382 10383 File: magit.info, Node: Function and Command Index, Next: Variable Index, Prev: Keystroke Index, Up: Top 10384 10385 Appendix D Function and Command Index 10386 ************************************* 10387 10388 10389 * Menu: 10390 10391 * bug-reference-mode: Commit Mode and Hooks. 10392 (line 48) 10393 * forward-line: Editing Rebase Sequences. 10394 (line 34) 10395 * git-commit-ack: Commit Pseudo Headers. 10396 (line 16) 10397 * git-commit-cc: Commit Pseudo Headers. 10398 (line 28) 10399 * git-commit-check-style-conventions: Commit Message Conventions. 10400 (line 33) 10401 * git-commit-insert-pseudo-header: Commit Pseudo Headers. 10402 (line 13) 10403 * git-commit-next-message: Editing Commit Messages. 10404 (line 41) 10405 * git-commit-prev-message: Editing Commit Messages. 10406 (line 36) 10407 * git-commit-propertize-diff: Commit Mode and Hooks. 10408 (line 40) 10409 * git-commit-reported: Commit Pseudo Headers. 10410 (line 31) 10411 * git-commit-review: Commit Pseudo Headers. 10412 (line 19) 10413 * git-commit-save-message: Editing Commit Messages. 10414 (line 33) 10415 * git-commit-save-message <1>: Commit Mode and Hooks. 10416 (line 26) 10417 * git-commit-setup-changelog-support: Commit Mode and Hooks. 10418 (line 29) 10419 * git-commit-signoff: Commit Pseudo Headers. 10420 (line 22) 10421 * git-commit-suggested: Commit Pseudo Headers. 10422 (line 35) 10423 * git-commit-test: Commit Pseudo Headers. 10424 (line 25) 10425 * git-commit-turn-on-auto-fill: Commit Mode and Hooks. 10426 (line 33) 10427 * git-commit-turn-on-flyspell: Commit Mode and Hooks. 10428 (line 36) 10429 * git-rebase-backward-line: Editing Rebase Sequences. 10430 (line 31) 10431 * git-rebase-break: Editing Rebase Sequences. 10432 (line 70) 10433 * git-rebase-edit: Editing Rebase Sequences. 10434 (line 46) 10435 * git-rebase-exec: Editing Rebase Sequences. 10436 (line 62) 10437 * git-rebase-fixup: Editing Rebase Sequences. 10438 (line 52) 10439 * git-rebase-insert: Editing Rebase Sequences. 10440 (line 74) 10441 * git-rebase-kill-line: Editing Rebase Sequences. 10442 (line 56) 10443 * git-rebase-label: Editing Rebase Sequences. 10444 (line 94) 10445 * git-rebase-merge: Editing Rebase Sequences. 10446 (line 102) 10447 * git-rebase-merge-toggle-editmsg: Editing Rebase Sequences. 10448 (line 108) 10449 * git-rebase-move-line-down: Editing Rebase Sequences. 10450 (line 40) 10451 * git-rebase-move-line-up: Editing Rebase Sequences. 10452 (line 37) 10453 * git-rebase-pick: Editing Rebase Sequences. 10454 (line 59) 10455 * git-rebase-reset: Editing Rebase Sequences. 10456 (line 97) 10457 * git-rebase-reword: Editing Rebase Sequences. 10458 (line 43) 10459 * git-rebase-show-commit: Editing Rebase Sequences. 10460 (line 15) 10461 * git-rebase-show-or-scroll-down: Editing Rebase Sequences. 10462 (line 25) 10463 * git-rebase-show-or-scroll-up: Editing Rebase Sequences. 10464 (line 19) 10465 * git-rebase-squash: Editing Rebase Sequences. 10466 (line 49) 10467 * git-rebase-undo: Editing Rebase Sequences. 10468 (line 77) 10469 * ido-enter-magit-status: Status Buffer. (line 96) 10470 * magit-add-section-hook: Section Hooks. (line 20) 10471 * magit-after-save-refresh-status: Automatic Refreshing of Magit Buffers. 10472 (line 55) 10473 * magit-am: Maildir Patches. (line 9) 10474 * magit-am-abort: Maildir Patches. (line 38) 10475 * magit-am-apply-maildir: Maildir Patches. (line 20) 10476 * magit-am-apply-patches: Maildir Patches. (line 14) 10477 * magit-am-continue: Maildir Patches. (line 31) 10478 * magit-am-skip: Maildir Patches. (line 34) 10479 * magit-apply: Applying. (line 34) 10480 * magit-bisect: Bisecting. (line 9) 10481 * magit-bisect-bad: Bisecting. (line 32) 10482 * magit-bisect-good: Bisecting. (line 36) 10483 * magit-bisect-mark: Bisecting. (line 40) 10484 * magit-bisect-reset: Bisecting. (line 51) 10485 * magit-bisect-run: Bisecting. (line 26) 10486 * magit-bisect-skip: Bisecting. (line 46) 10487 * magit-bisect-start: Bisecting. (line 16) 10488 * magit-blame: Blaming. (line 28) 10489 * magit-blame <1>: Blaming. (line 34) 10490 * magit-blame <2>: Blaming. (line 115) 10491 * magit-blame <3>: Commands for Buffers Visiting Files. 10492 (line 52) 10493 * magit-blame <4>: Commands for Buffers Visiting Files. 10494 (line 137) 10495 * magit-blame-addition: Blaming. (line 28) 10496 * magit-blame-addition <1>: Blaming. (line 45) 10497 * magit-blame-additions: Commands for Buffers Visiting Files. 10498 (line 52) 10499 * magit-blame-copy-hash: Blaming. (line 134) 10500 * magit-blame-cycle-style: Blaming. (line 141) 10501 * magit-blame-echo: Blaming. (line 28) 10502 * magit-blame-echo <1>: Blaming. (line 76) 10503 * magit-blame-echo <2>: Commands for Buffers Visiting Files. 10504 (line 52) 10505 * magit-blame-next-chunk: Blaming. (line 118) 10506 * magit-blame-next-chunk-same-commit: Blaming. (line 121) 10507 * magit-blame-previous-chunk: Blaming. (line 124) 10508 * magit-blame-previous-chunk-same-commit: Blaming. (line 127) 10509 * magit-blame-quit: Blaming. (line 28) 10510 * magit-blame-quit <1>: Blaming. (line 87) 10511 * magit-blame-quit <2>: Blaming. (line 130) 10512 * magit-blame-quit <3>: Commands for Buffers Visiting Files. 10513 (line 52) 10514 * magit-blame-removal: Blaming. (line 28) 10515 * magit-blame-removal <1>: Blaming. (line 60) 10516 * magit-blame-removal <2>: Commands for Buffers Visiting Files. 10517 (line 52) 10518 * magit-blame-reverse: Blaming. (line 28) 10519 * magit-blame-reverse <1>: Blaming. (line 68) 10520 * magit-blame-reverse <2>: Commands for Buffers Visiting Files. 10521 (line 52) 10522 * magit-blob-next: Commands for Buffers Visiting Files. 10523 (line 52) 10524 * magit-blob-next <1>: Commands for Buffers Visiting Files. 10525 (line 153) 10526 * magit-blob-next <2>: Minor Mode for Buffers Visiting Blobs. 10527 (line 16) 10528 * magit-blob-previous: Commands for Buffers Visiting Files. 10529 (line 52) 10530 * magit-blob-previous <1>: Commands for Buffers Visiting Files. 10531 (line 149) 10532 * magit-blob-previous <2>: Minor Mode for Buffers Visiting Blobs. 10533 (line 13) 10534 * magit-blob-visit-file: Commands for Buffers Visiting Files. 10535 (line 52) 10536 * magit-blob-visit-file <1>: Commands for Buffers Visiting Files. 10537 (line 160) 10538 * magit-branch: Branch Commands. (line 13) 10539 * magit-branch-and-checkout: Branch Commands. (line 63) 10540 * magit-branch-checkout: Branch Commands. (line 69) 10541 * magit-branch-configure: Branch Commands. (line 31) 10542 * magit-branch-create: Branch Commands. (line 54) 10543 * magit-branch-delete: Branch Commands. (line 138) 10544 * magit-branch-or-checkout: Branch Commands. (line 257) 10545 * magit-branch-orphan: Branch Commands. (line 253) 10546 * magit-branch-rename: Branch Commands. (line 149) 10547 * magit-branch-reset: Branch Commands. (line 123) 10548 * magit-branch-shelve: Auxiliary Branch Commands. 10549 (line 9) 10550 * magit-branch-spinoff: Branch Commands. (line 91) 10551 * magit-branch-spinout: Branch Commands. (line 118) 10552 * magit-branch-unshelve: Auxiliary Branch Commands. 10553 (line 19) 10554 * magit-builtin-completing-read: Support for Completion Frameworks. 10555 (line 41) 10556 * magit-bundle: Bundle. (line 8) 10557 * magit-call-git: Calling Git for Effect. 10558 (line 28) 10559 * magit-call-process: Calling Git for Effect. 10560 (line 31) 10561 * magit-cancel-section: Creating Sections. (line 69) 10562 * magit-checkout: Branch Commands. (line 47) 10563 * magit-cherry: Cherries. (line 18) 10564 * magit-cherry-apply: Cherry Picking. (line 23) 10565 * magit-cherry-copy: Cherry Picking. (line 17) 10566 * magit-cherry-donate: Cherry Picking. (line 51) 10567 * magit-cherry-harvest: Cherry Picking. (line 40) 10568 * magit-cherry-pick: Cherry Picking. (line 9) 10569 * magit-cherry-spinoff: Cherry Picking. (line 72) 10570 * magit-cherry-spinout: Cherry Picking. (line 62) 10571 * magit-clone: Cloning Repository. (line 20) 10572 * magit-clone-bare: Cloning Repository. (line 44) 10573 * magit-clone-mirror: Cloning Repository. (line 48) 10574 * magit-clone-regular: Cloning Repository. (line 28) 10575 * magit-clone-shallow: Cloning Repository. (line 32) 10576 * magit-clone-shallow-exclude: Cloning Repository. (line 61) 10577 * magit-clone-shallow-since: Cloning Repository. (line 55) 10578 * magit-clone-sparse: Cloning Repository. (line 38) 10579 * magit-commit: Initiating a Commit. (line 9) 10580 * magit-commit <1>: Commands for Buffers Visiting Files. 10581 (line 52) 10582 * magit-commit <2>: Commands for Buffers Visiting Files. 10583 (line 176) 10584 * magit-commit-amend: Initiating a Commit. (line 18) 10585 * magit-commit-augment: Initiating a Commit. (line 59) 10586 * magit-commit-create: Initiating a Commit. (line 14) 10587 * magit-commit-extend: Initiating a Commit. (line 21) 10588 * magit-commit-fixup: Initiating a Commit. (line 39) 10589 * magit-commit-instant-fixup: Initiating a Commit. (line 46) 10590 * magit-commit-instant-squash: Initiating a Commit. (line 56) 10591 * magit-commit-reword: Initiating a Commit. (line 30) 10592 * magit-commit-squash: Initiating a Commit. (line 49) 10593 * magit-completing-read: Support for Completion Frameworks. 10594 (line 57) 10595 * magit-copy-buffer-revision: Common Commands. (line 39) 10596 * magit-copy-section-value: Common Commands. (line 22) 10597 * magit-current-section: Section Selection. (line 6) 10598 * magit-cycle-margin-style: Log Margin. (line 63) 10599 * magit-debug-git-executable: Git Executable. (line 55) 10600 * magit-debug-git-executable <1>: Debugging Tools. (line 57) 10601 * magit-define-section-jumper: Creating Sections. (line 74) 10602 * magit-describe-section: Section Types and Values. 10603 (line 14) 10604 * magit-describe-section-briefly: Section Types and Values. 10605 (line 17) 10606 * magit-describe-section-briefly <1>: Matching Sections. (line 7) 10607 * magit-diff: Diffing. (line 22) 10608 * magit-diff <1>: Commands for Buffers Visiting Files. 10609 (line 52) 10610 * magit-diff <2>: Commands for Buffers Visiting Files. 10611 (line 91) 10612 * magit-diff-buffer-file: Commands for Buffers Visiting Files. 10613 (line 52) 10614 * magit-diff-buffer-file <1>: Commands for Buffers Visiting Files. 10615 (line 101) 10616 * magit-diff-default-context: Refreshing Diffs. (line 68) 10617 * magit-diff-dwim: Diffing. (line 27) 10618 * magit-diff-edit-hunk-commit: Commands Available in Diffs. 10619 (line 24) 10620 * magit-diff-flip-revs: Refreshing Diffs. (line 45) 10621 * magit-diff-less-context: Refreshing Diffs. (line 62) 10622 * magit-diff-more-context: Refreshing Diffs. (line 65) 10623 * magit-diff-paths: Diffing. (line 56) 10624 * magit-diff-range: Diffing. (line 30) 10625 * magit-diff-refresh: Refreshing Diffs. (line 16) 10626 * magit-diff-refresh <1>: Refreshing Diffs. (line 21) 10627 * magit-diff-save-default-arguments: Refreshing Diffs. (line 31) 10628 * magit-diff-scope: Matching Sections. (line 110) 10629 * magit-diff-set-default-arguments: Refreshing Diffs. (line 25) 10630 * magit-diff-show-or-scroll-down: Log Buffer. (line 50) 10631 * magit-diff-show-or-scroll-down <1>: Blaming. (line 103) 10632 * magit-diff-show-or-scroll-up: Log Buffer. (line 41) 10633 * magit-diff-show-or-scroll-up <1>: Blaming. (line 94) 10634 * magit-diff-staged: Diffing. (line 48) 10635 * magit-diff-switch-range-type: Refreshing Diffs. (line 41) 10636 * magit-diff-toggle-file-filter: Refreshing Diffs. (line 49) 10637 * magit-diff-toggle-refine-hunk: Refreshing Diffs. (line 38) 10638 * magit-diff-trace-definition: Commands Available in Diffs. 10639 (line 15) 10640 * magit-diff-type: Matching Sections. (line 88) 10641 * magit-diff-unstaged: Diffing. (line 53) 10642 * magit-diff-visit-file: Visiting Files and Blobs from a Diff. 10643 (line 9) 10644 * magit-diff-visit-file-other-frame: Visiting Files and Blobs from a Diff. 10645 (line 71) 10646 * magit-diff-visit-file-other-window: Visiting Files and Blobs from a Diff. 10647 (line 70) 10648 * magit-diff-visit-file-worktree: Visiting Files and Blobs from a Diff. 10649 (line 50) 10650 * magit-diff-visit-worktree-file-other-frame: Visiting Files and Blobs from a Diff. 10651 (line 73) 10652 * magit-diff-visit-worktree-file-other-window: Visiting Files and Blobs from a Diff. 10653 (line 72) 10654 * magit-diff-while-committing: Refreshing Diffs. (line 75) 10655 * magit-diff-while-committing <1>: Editing Commit Messages. 10656 (line 54) 10657 * magit-diff-working-tree: Diffing. (line 43) 10658 * magit-disable-section-inserter: Per-Repository Configuration. 10659 (line 31) 10660 * magit-discard: Applying. (line 40) 10661 * magit-dispatch: Transient Commands. (line 20) 10662 * magit-display-buffer: Switching Buffers. (line 6) 10663 * magit-display-buffer-fullcolumn-most-v1: Switching Buffers. (line 68) 10664 * magit-display-buffer-fullframe-status-topleft-v1: Switching Buffers. 10665 (line 59) 10666 * magit-display-buffer-fullframe-status-v1: Switching Buffers. 10667 (line 54) 10668 * magit-display-buffer-same-window-except-diff-v1: Switching Buffers. 10669 (line 49) 10670 * magit-display-buffer-traditional: Switching Buffers. (line 42) 10671 * magit-display-repository-buffer: Common Commands. (line 9) 10672 * magit-display-repository-buffer <1>: Commands for Buffers Visiting Files. 10673 (line 52) 10674 * magit-display-repository-buffer <2>: Commands for Buffers Visiting Files. 10675 (line 172) 10676 * magit-ediff: Ediffing. (line 21) 10677 * magit-ediff-compare: Ediffing. (line 25) 10678 * magit-ediff-dwim: Ediffing. (line 10) 10679 * magit-ediff-resolve-all: Ediffing. (line 48) 10680 * magit-ediff-resolve-rest: Ediffing. (line 33) 10681 * magit-ediff-show-commit: Ediffing. (line 100) 10682 * magit-ediff-show-staged: Ediffing. (line 94) 10683 * magit-ediff-show-stash: Ediffing. (line 103) 10684 * magit-ediff-show-unstaged: Ediffing. (line 91) 10685 * magit-ediff-show-working-tree: Ediffing. (line 97) 10686 * magit-ediff-stage: Ediffing. (line 87) 10687 * magit-edit-line-commit: Commands for Buffers Visiting Files. 10688 (line 52) 10689 * magit-edit-line-commit <1>: Commands for Buffers Visiting Files. 10690 (line 182) 10691 * magit-emacs-Q-command: Debugging Tools. (line 16) 10692 * magit-fetch: Fetching. (line 10) 10693 * magit-fetch-all: Fetching. (line 45) 10694 * magit-fetch-branch: Fetching. (line 37) 10695 * magit-fetch-from-pushremote: Fetching. (line 15) 10696 * magit-fetch-from-upstream: Fetching. (line 22) 10697 * magit-fetch-modules: Fetching. (line 48) 10698 * magit-fetch-modules <1>: Submodule Transient. (line 51) 10699 * magit-fetch-other: Fetching. (line 34) 10700 * magit-fetch-refspec: Fetching. (line 41) 10701 * magit-file-checkout: Resetting. (line 44) 10702 * magit-file-checkout <1>: Commands for Buffers Visiting Files. 10703 (line 52) 10704 * magit-file-checkout <2>: Commands for Buffers Visiting Files. 10705 (line 86) 10706 * magit-file-delete: Commands for Buffers Visiting Files. 10707 (line 52) 10708 * magit-file-delete <1>: Commands for Buffers Visiting Files. 10709 (line 82) 10710 * magit-file-dispatch: Commands for Buffers Visiting Files. 10711 (line 52) 10712 * magit-file-dispatch <1>: Commands for Buffers Visiting Files. 10713 (line 58) 10714 * magit-file-rename: Commands for Buffers Visiting Files. 10715 (line 52) 10716 * magit-file-rename <1>: Commands for Buffers Visiting Files. 10717 (line 78) 10718 * magit-file-untrack: Commands for Buffers Visiting Files. 10719 (line 52) 10720 * magit-file-untrack <1>: Commands for Buffers Visiting Files. 10721 (line 74) 10722 * magit-find-file: General-Purpose Visit Commands. 10723 (line 9) 10724 * magit-find-file <1>: Commands for Buffers Visiting Files. 10725 (line 52) 10726 * magit-find-file <2>: Commands for Buffers Visiting Files. 10727 (line 156) 10728 * magit-find-file-other-frame: General-Purpose Visit Commands. 10729 (line 19) 10730 * magit-find-file-other-window: General-Purpose Visit Commands. 10731 (line 14) 10732 * magit-generate-buffer-name-default-function: Naming Buffers. 10733 (line 16) 10734 * magit-get-section: Matching Sections. (line 14) 10735 * magit-git: Calling Git for Effect. 10736 (line 46) 10737 * magit-git-command: Running Git Manually. 10738 (line 25) 10739 * magit-git-command-topdir: Running Git Manually. 10740 (line 17) 10741 * magit-git-exit-code: Getting a Value from Git. 10742 (line 10) 10743 * magit-git-failure: Getting a Value from Git. 10744 (line 17) 10745 * magit-git-false: Getting a Value from Git. 10746 (line 25) 10747 * magit-git-insert: Getting a Value from Git. 10748 (line 29) 10749 * magit-git-items: Getting a Value from Git. 10750 (line 41) 10751 * magit-git-lines: Getting a Value from Git. 10752 (line 37) 10753 * magit-git-mergetool: Running Git Manually. 10754 (line 62) 10755 * magit-git-mergetool <1>: Ediffing. (line 79) 10756 * magit-git-str: Getting a Value from Git. 10757 (line 75) 10758 * magit-git-string: Getting a Value from Git. 10759 (line 32) 10760 * magit-git-success: Getting a Value from Git. 10761 (line 13) 10762 * magit-git-true: Getting a Value from Git. 10763 (line 21) 10764 * magit-git-wash: Calling Git for Effect. 10765 (line 50) 10766 * magit-go-backward: Log Buffer. (line 20) 10767 * magit-go-backward <1>: Refreshing Diffs. (line 84) 10768 * magit-go-forward: Log Buffer. (line 23) 10769 * magit-go-forward <1>: Refreshing Diffs. (line 87) 10770 * magit-hunk-set-window-start: Section Movement. (line 45) 10771 * magit-ido-completing-read: Support for Completion Frameworks. 10772 (line 46) 10773 * magit-init: Creating Repository. (line 7) 10774 * magit-insert-am-sequence: Status Sections. (line 25) 10775 * magit-insert-assumed-unchanged-files: Status Sections. (line 102) 10776 * magit-insert-bisect-log: Status Sections. (line 39) 10777 * magit-insert-bisect-output: Status Sections. (line 33) 10778 * magit-insert-bisect-rest: Status Sections. (line 36) 10779 * magit-insert-diff-filter-header: Status Header Sections. 10780 (line 35) 10781 * magit-insert-error-header: Status Header Sections. 10782 (line 26) 10783 * magit-insert-head-branch-header: Status Header Sections. 10784 (line 38) 10785 * magit-insert-heading: Creating Sections. (line 41) 10786 * magit-insert-ignored-files: Status Sections. (line 87) 10787 * magit-insert-local-branches: References Sections. (line 16) 10788 * magit-insert-merge-log: Status Sections. (line 17) 10789 * magit-insert-modules: Status Module Sections. 10790 (line 12) 10791 * magit-insert-modules-overview: Status Module Sections. 10792 (line 30) 10793 * magit-insert-modules-unpulled-from-pushremote: Status Module Sections. 10794 (line 45) 10795 * magit-insert-modules-unpulled-from-upstream: Status Module Sections. 10796 (line 40) 10797 * magit-insert-modules-unpushed-to-pushremote: Status Module Sections. 10798 (line 55) 10799 * magit-insert-modules-unpushed-to-upstream: Status Module Sections. 10800 (line 50) 10801 * magit-insert-push-branch-header: Status Header Sections. 10802 (line 45) 10803 * magit-insert-rebase-sequence: Status Sections. (line 21) 10804 * magit-insert-recent-commits: Status Sections. (line 114) 10805 * magit-insert-remote-branches: References Sections. (line 19) 10806 * magit-insert-remote-header: Status Header Sections. 10807 (line 58) 10808 * magit-insert-repo-header: Status Header Sections. 10809 (line 55) 10810 * magit-insert-section: Creating Sections. (line 6) 10811 * magit-insert-sequencer-sequence: Status Sections. (line 29) 10812 * magit-insert-skip-worktree-files: Status Sections. (line 96) 10813 * magit-insert-staged-changes: Status Sections. (line 57) 10814 * magit-insert-stashes: Status Sections. (line 60) 10815 * magit-insert-status-headers: Status Header Sections. 10816 (line 12) 10817 * magit-insert-tags: References Sections. (line 22) 10818 * magit-insert-tags-header: Status Header Sections. 10819 (line 49) 10820 * magit-insert-tracked-files: Status Sections. (line 84) 10821 * magit-insert-unpulled-cherries: Status Sections. (line 123) 10822 * magit-insert-unpulled-from-pushremote: Status Sections. (line 70) 10823 * magit-insert-unpulled-from-upstream: Status Sections. (line 66) 10824 * magit-insert-unpulled-or-recent-commits: Status Sections. (line 108) 10825 * magit-insert-unpushed-cherries: Status Sections. (line 129) 10826 * magit-insert-unpushed-to-pushremote: Status Sections. (line 78) 10827 * magit-insert-unpushed-to-upstream: Status Sections. (line 74) 10828 * magit-insert-unstaged-changes: Status Sections. (line 54) 10829 * magit-insert-untracked-files: Status Sections. (line 42) 10830 * magit-insert-upstream-branch-header: Status Header Sections. 10831 (line 41) 10832 * magit-insert-user-header: Status Header Sections. 10833 (line 65) 10834 * magit-jump-to-diffstat-or-diff: Commands Available in Diffs. 10835 (line 43) 10836 * magit-kill-this-buffer: Minor Mode for Buffers Visiting Blobs. 10837 (line 19) 10838 * magit-list-repositories: Repository List. (line 6) 10839 * magit-list-submodules: Listing Submodules. (line 13) 10840 * magit-list-submodules <1>: Submodule Transient. (line 48) 10841 * magit-log: Logging. (line 28) 10842 * magit-log <1>: Commands for Buffers Visiting Files. 10843 (line 52) 10844 * magit-log <2>: Commands for Buffers Visiting Files. 10845 (line 109) 10846 * magit-log-all: Logging. (line 59) 10847 * magit-log-all-branches: Logging. (line 56) 10848 * magit-log-branches: Logging. (line 53) 10849 * magit-log-buffer-file: Commands for Buffers Visiting Files. 10850 (line 52) 10851 * magit-log-buffer-file <1>: Commands for Buffers Visiting Files. 10852 (line 119) 10853 * magit-log-bury-buffer: Log Buffer. (line 14) 10854 * magit-log-current: Logging. (line 33) 10855 * magit-log-double-commit-limit: Log Buffer. (line 64) 10856 * magit-log-half-commit-limit: Log Buffer. (line 67) 10857 * magit-log-head: Logging. (line 38) 10858 * magit-log-maybe-show-more-commits: Section Movement. (line 58) 10859 * magit-log-maybe-update-blob-buffer: Section Movement. (line 72) 10860 * magit-log-maybe-update-revision-buffer: Section Movement. (line 65) 10861 * magit-log-merged: Commands for Buffers Visiting Files. 10862 (line 52) 10863 * magit-log-merged <1>: Commands for Buffers Visiting Files. 10864 (line 132) 10865 * magit-log-move-to-parent: Log Buffer. (line 26) 10866 * magit-log-move-to-revision: Log Buffer. (line 31) 10867 * magit-log-other: Logging. (line 47) 10868 * magit-log-refresh: Refreshing Logs. (line 12) 10869 * magit-log-refresh <1>: Refreshing Logs. (line 17) 10870 * magit-log-refresh <2>: Log Buffer. (line 7) 10871 * magit-log-related: Logging. (line 41) 10872 * magit-log-save-default-arguments: Refreshing Logs. (line 27) 10873 * magit-log-select-pick: Select from Log. (line 21) 10874 * magit-log-select-quit: Select from Log. (line 26) 10875 * magit-log-set-default-arguments: Refreshing Logs. (line 21) 10876 * magit-log-toggle-commit-limit: Log Buffer. (line 59) 10877 * magit-log-trace-definition: Commands for Buffers Visiting Files. 10878 (line 52) 10879 * magit-log-trace-definition <1>: Commands for Buffers Visiting Files. 10880 (line 129) 10881 * magit-margin-settings: Log Margin. (line 52) 10882 * magit-maybe-set-dedicated: Switching Buffers. (line 89) 10883 * magit-merge: Merging. (line 10) 10884 * magit-merge <1>: Merging. (line 86) 10885 * magit-merge-abort: Merging. (line 91) 10886 * magit-merge-absorb: Merging. (line 42) 10887 * magit-merge-editmsg: Merging. (line 30) 10888 * magit-merge-into: Merging. (line 54) 10889 * magit-merge-nocommit: Merging. (line 36) 10890 * magit-merge-plain: Merging. (line 18) 10891 * magit-merge-preview: Merging. (line 75) 10892 * magit-merge-squash: Merging. (line 67) 10893 * magit-mode-bury-buffer: Quitting Windows. (line 7) 10894 * magit-mode-display-buffer: Refreshing Buffers. (line 32) 10895 * magit-mode-quit-window: Quitting Windows. (line 34) 10896 * magit-mode-setup: Refreshing Buffers. (line 17) 10897 * magit-notes: Notes. (line 9) 10898 * magit-notes-edit: Notes. (line 14) 10899 * magit-notes-merge: Notes. (line 35) 10900 * magit-notes-merge-abort: Notes. (line 47) 10901 * magit-notes-merge-commit: Notes. (line 43) 10902 * magit-notes-prune: Notes. (line 28) 10903 * magit-notes-remove: Notes. (line 21) 10904 * magit-patch: Plain Patches. (line 7) 10905 * magit-patch-apply: Plain Patches. (line 20) 10906 * magit-patch-apply <1>: Maildir Patches. (line 23) 10907 * magit-patch-create: Plain Patches. (line 12) 10908 * magit-patch-save: Plain Patches. (line 26) 10909 * magit-pop-revision-stack: Using the Revision Stack. 10910 (line 7) 10911 * magit-process: Viewing Git Output. (line 17) 10912 * magit-process-file: Getting a Value from Git. 10913 (line 57) 10914 * magit-process-git: Getting a Value from Git. 10915 (line 50) 10916 * magit-process-kill: Viewing Git Output. (line 24) 10917 * magit-pull: Pulling. (line 10) 10918 * magit-pull-branch: Pulling. (line 28) 10919 * magit-pull-from-pushremote: Pulling. (line 14) 10920 * magit-pull-from-upstream: Pulling. (line 21) 10921 * magit-push: Pushing. (line 10) 10922 * magit-push-current: Pushing. (line 29) 10923 * magit-push-current-to-pushremote: Pushing. (line 15) 10924 * magit-push-current-to-upstream: Pushing. (line 22) 10925 * magit-push-implicitly: Pushing. (line 74) 10926 * magit-push-matching: Pushing. (line 45) 10927 * magit-push-other: Pushing. (line 33) 10928 * magit-push-refspecs: Pushing. (line 37) 10929 * magit-push-tag: Pushing. (line 59) 10930 * magit-push-tags: Pushing. (line 52) 10931 * magit-push-to-remote: Pushing. (line 91) 10932 * magit-rebase: Rebasing. (line 10) 10933 * magit-rebase-abort: Rebasing. (line 111) 10934 * magit-rebase-autosquash: Rebasing. (line 79) 10935 * magit-rebase-branch: Rebasing. (line 42) 10936 * magit-rebase-continue: Rebasing. (line 97) 10937 * magit-rebase-edit: Rebasing. (line 107) 10938 * magit-rebase-edit-commit: Rebasing. (line 83) 10939 * magit-rebase-interactive: Rebasing. (line 76) 10940 * magit-rebase-onto-pushremote: Rebasing. (line 28) 10941 * magit-rebase-onto-upstream: Rebasing. (line 35) 10942 * magit-rebase-remove-commit: Rebasing. (line 91) 10943 * magit-rebase-reword-commit: Rebasing. (line 87) 10944 * magit-rebase-skip: Rebasing. (line 103) 10945 * magit-rebase-subset: Rebasing. (line 47) 10946 * magit-reflog-current: Reflog. (line 12) 10947 * magit-reflog-head: Reflog. (line 18) 10948 * magit-reflog-other: Reflog. (line 15) 10949 * magit-refresh: Automatic Refreshing of Magit Buffers. 10950 (line 26) 10951 * magit-refresh-all: Automatic Refreshing of Magit Buffers. 10952 (line 34) 10953 * magit-refs-set-show-commit-count: References Buffer. (line 34) 10954 * magit-region-sections: Section Selection. (line 9) 10955 * magit-region-values: Section Selection. (line 35) 10956 * magit-remote: Remote Commands. (line 14) 10957 * magit-remote-add: Remote Commands. (line 48) 10958 * magit-remote-configure: Remote Commands. (line 32) 10959 * magit-remote-prune: Remote Commands. (line 63) 10960 * magit-remote-prune-refspecs: Remote Commands. (line 67) 10961 * magit-remote-remove: Remote Commands. (line 60) 10962 * magit-remote-rename: Remote Commands. (line 52) 10963 * magit-remote-set-url: Remote Commands. (line 56) 10964 * magit-repolist-column-branch: Repository List. (line 51) 10965 * magit-repolist-column-branches: Repository List. (line 58) 10966 * magit-repolist-column-flag: Repository List. (line 64) 10967 * magit-repolist-column-flags: Repository List. (line 76) 10968 * magit-repolist-column-ident: Repository List. (line 40) 10969 * magit-repolist-column-path: Repository List. (line 44) 10970 * magit-repolist-column-stashes: Repository List. (line 61) 10971 * magit-repolist-column-unpulled-from-pushremote: Repository List. 10972 (line 87) 10973 * magit-repolist-column-unpulled-from-upstream: Repository List. 10974 (line 83) 10975 * magit-repolist-column-unpushed-to-pushremote: Repository List. 10976 (line 95) 10977 * magit-repolist-column-unpushed-to-upstream: Repository List. 10978 (line 91) 10979 * magit-repolist-column-upstream: Repository List. (line 54) 10980 * magit-repolist-column-version: Repository List. (line 47) 10981 * magit-repolist-fetch: Repository List. (line 111) 10982 * magit-repolist-find-file-other-frame: Repository List. (line 115) 10983 * magit-repolist-mark: Repository List. (line 105) 10984 * magit-repolist-status: Repository List. (line 102) 10985 * magit-repolist-unmark: Repository List. (line 108) 10986 * magit-reset-hard: Resetting. (line 24) 10987 * magit-reset-index: Staging and Unstaging. 10988 (line 78) 10989 * magit-reset-index <1>: Resetting. (line 33) 10990 * magit-reset-keep: Resetting. (line 28) 10991 * magit-reset-mixed: Resetting. (line 15) 10992 * magit-reset-quickly: Resetting. (line 9) 10993 * magit-reset-soft: Resetting. (line 19) 10994 * magit-reset-worktree: Resetting. (line 39) 10995 * magit-reset-worktree <1>: Wip Modes. (line 64) 10996 * magit-restore-window-configuration: Quitting Windows. (line 24) 10997 * magit-reverse: Applying. (line 47) 10998 * magit-reverse-in-index: Staging and Unstaging. 10999 (line 58) 11000 * magit-revert: Reverting. (line 7) 11001 * magit-revert-and-commit: Reverting. (line 15) 11002 * magit-revert-no-commit: Reverting. (line 20) 11003 * magit-run: Running Git Manually. 11004 (line 13) 11005 * magit-run-git: Calling Git for Effect. 11006 (line 34) 11007 * magit-run-git-async: Calling Git for Effect. 11008 (line 59) 11009 * magit-run-git-gui: Running Git Manually. 11010 (line 59) 11011 * magit-run-git-with-editor: Calling Git for Effect. 11012 (line 71) 11013 * magit-run-git-with-input: Calling Git for Effect. 11014 (line 37) 11015 * magit-run-gitk: Running Git Manually. 11016 (line 50) 11017 * magit-run-gitk-all: Running Git Manually. 11018 (line 53) 11019 * magit-run-gitk-branches: Running Git Manually. 11020 (line 56) 11021 * magit-save-window-configuration: Switching Buffers. (line 80) 11022 * magit-section-backward: Section Movement. (line 11) 11023 * magit-section-backward-siblings: Section Movement. (line 19) 11024 * magit-section-case: Matching Sections. (line 66) 11025 * magit-section-cycle: Section Visibility. (line 14) 11026 * magit-section-cycle-diffs: Section Visibility. (line 29) 11027 * magit-section-cycle-global: Section Visibility. (line 33) 11028 * magit-section-forward: Section Movement. (line 16) 11029 * magit-section-forward-siblings: Section Movement. (line 24) 11030 * magit-section-hide: Section Visibility. (line 55) 11031 * magit-section-hide-children: Section Visibility. (line 67) 11032 * magit-section-ident: Matching Sections. (line 10) 11033 * magit-section-match: Matching Sections. (line 18) 11034 * magit-section-set-window-start: Section Movement. (line 52) 11035 * magit-section-show: Section Visibility. (line 52) 11036 * magit-section-show-children: Section Visibility. (line 62) 11037 * magit-section-show-headings: Section Visibility. (line 58) 11038 * magit-section-show-level-1: Section Visibility. (line 39) 11039 * magit-section-show-level-1-all: Section Visibility. (line 45) 11040 * magit-section-show-level-2: Section Visibility. (line 39) 11041 * magit-section-show-level-2-all: Section Visibility. (line 45) 11042 * magit-section-show-level-3: Section Visibility. (line 39) 11043 * magit-section-show-level-3-all: Section Visibility. (line 45) 11044 * magit-section-show-level-4: Section Visibility. (line 39) 11045 * magit-section-show-level-4-all: Section Visibility. (line 45) 11046 * magit-section-toggle: Section Visibility. (line 10) 11047 * magit-section-toggle-children: Section Visibility. (line 70) 11048 * magit-section-up: Section Movement. (line 28) 11049 * magit-section-value-if: Matching Sections. (line 57) 11050 * magit-sequence-abort: Cherry Picking. (line 91) 11051 * magit-sequence-abort <1>: Reverting. (line 35) 11052 * magit-sequence-continue: Cherry Picking. (line 85) 11053 * magit-sequence-continue <1>: Reverting. (line 29) 11054 * magit-sequence-skip: Cherry Picking. (line 88) 11055 * magit-sequence-skip <1>: Reverting. (line 32) 11056 * magit-shell-command: Running Git Manually. 11057 (line 38) 11058 * magit-shell-command-topdir: Running Git Manually. 11059 (line 34) 11060 * magit-show-commit: Diffing. (line 63) 11061 * magit-show-commit <1>: Blaming. (line 91) 11062 * magit-show-refs: References Buffer. (line 7) 11063 * magit-show-refs-current: References Buffer. (line 25) 11064 * magit-show-refs-head: References Buffer. (line 21) 11065 * magit-show-refs-other: References Buffer. (line 30) 11066 * magit-snapshot-both: Stashing. (line 36) 11067 * magit-snapshot-index: Stashing. (line 42) 11068 * magit-snapshot-worktree: Stashing. (line 46) 11069 * magit-sparse-checkout: Sparse checkouts. (line 17) 11070 * magit-sparse-checkout-add: Sparse checkouts. (line 39) 11071 * magit-sparse-checkout-disable: Sparse checkouts. (line 50) 11072 * magit-sparse-checkout-enable: Sparse checkouts. (line 21) 11073 * magit-sparse-checkout-reapply: Sparse checkouts. (line 44) 11074 * magit-sparse-checkout-set: Sparse checkouts. (line 33) 11075 * magit-stage: Staging and Unstaging. 11076 (line 29) 11077 * magit-stage-buffer-file: Commands for Buffers Visiting Files. 11078 (line 52) 11079 * magit-stage-buffer-file <1>: Commands for Buffers Visiting Files. 11080 (line 63) 11081 * magit-stage-file: Staging from File-Visiting Buffers. 11082 (line 11) 11083 * magit-stage-file <1>: Commands for Buffers Visiting Files. 11084 (line 52) 11085 * magit-stage-file <2>: Commands for Buffers Visiting Files. 11086 (line 63) 11087 * magit-stage-modified: Staging and Unstaging. 11088 (line 36) 11089 * magit-start-git: Calling Git for Effect. 11090 (line 82) 11091 * magit-start-process: Calling Git for Effect. 11092 (line 100) 11093 * magit-stash: Stashing. (line 9) 11094 * magit-stash-apply: Stashing. (line 52) 11095 * magit-stash-both: Stashing. (line 14) 11096 * magit-stash-branch: Stashing. (line 115) 11097 * magit-stash-branch-here: Stashing. (line 120) 11098 * magit-stash-clear: Stashing. (line 128) 11099 * magit-stash-drop: Stashing. (line 108) 11100 * magit-stash-format-patch: Stashing. (line 125) 11101 * magit-stash-index: Stashing. (line 20) 11102 * magit-stash-keep-index: Stashing. (line 30) 11103 * magit-stash-list: Stashing. (line 131) 11104 * magit-stash-pop: Stashing. (line 79) 11105 * magit-stash-show: Diffing. (line 67) 11106 * magit-stash-show <1>: Stashing. (line 112) 11107 * magit-stash-worktree: Stashing. (line 24) 11108 * magit-stashes-maybe-update-stash-buffer: Section Movement. (line 92) 11109 * magit-status: Status Buffer. (line 23) 11110 * magit-status-here: Commands for Buffers Visiting Files. 11111 (line 52) 11112 * magit-status-here <1>: Commands for Buffers Visiting Files. 11113 (line 166) 11114 * magit-status-maybe-update-blob-buffer: Section Movement. (line 87) 11115 * magit-status-maybe-update-revision-buffer: Section Movement. 11116 (line 77) 11117 * magit-status-maybe-update-stash-buffer: Section Movement. (line 82) 11118 * magit-status-quick: Status Buffer. (line 70) 11119 * magit-submodule: Submodule Transient. (line 7) 11120 * magit-submodule-add: Submodule Transient. (line 20) 11121 * magit-submodule-populate: Submodule Transient. (line 32) 11122 * magit-submodule-register: Submodule Transient. (line 26) 11123 * magit-submodule-synchronize: Submodule Transient. (line 40) 11124 * magit-submodule-unpopulate: Submodule Transient. (line 45) 11125 * magit-submodule-update: Submodule Transient. (line 36) 11126 * magit-subtree: Subtree. (line 9) 11127 * magit-subtree-add: Subtree. (line 24) 11128 * magit-subtree-add-commit: Subtree. (line 28) 11129 * magit-subtree-export: Subtree. (line 37) 11130 * magit-subtree-import: Subtree. (line 13) 11131 * magit-subtree-merge: Subtree. (line 31) 11132 * magit-subtree-pull: Subtree. (line 34) 11133 * magit-subtree-push: Subtree. (line 48) 11134 * magit-subtree-split: Subtree. (line 52) 11135 * magit-switch-to-repository-buffer: Common Commands. (line 6) 11136 * magit-switch-to-repository-buffer-other-frame: Common Commands. 11137 (line 8) 11138 * magit-switch-to-repository-buffer-other-window: Common Commands. 11139 (line 7) 11140 * magit-tag: Tagging. (line 9) 11141 * magit-tag-create: Tagging. (line 14) 11142 * magit-tag-delete: Tagging. (line 37) 11143 * magit-tag-prune: Tagging. (line 43) 11144 * magit-tag-release: Tagging. (line 18) 11145 * magit-toggle-buffer-lock: Modes and Buffers. (line 18) 11146 * magit-toggle-git-debug: Debugging Tools. (line 29) 11147 * magit-toggle-margin: Refreshing Logs. (line 34) 11148 * magit-toggle-margin <1>: Log Margin. (line 60) 11149 * magit-toggle-margin-details: Log Margin. (line 66) 11150 * magit-toggle-verbose-refresh: Debugging Tools. (line 52) 11151 * magit-unstage: Staging and Unstaging. 11152 (line 42) 11153 * magit-unstage-all: Staging and Unstaging. 11154 (line 50) 11155 * magit-unstage-buffer-file: Commands for Buffers Visiting Files. 11156 (line 52) 11157 * magit-unstage-buffer-file <1>: Commands for Buffers Visiting Files. 11158 (line 69) 11159 * magit-unstage-file: Staging from File-Visiting Buffers. 11160 (line 18) 11161 * magit-unstage-file <1>: Commands for Buffers Visiting Files. 11162 (line 52) 11163 * magit-unstage-file <2>: Commands for Buffers Visiting Files. 11164 (line 69) 11165 * magit-version: Git Executable. (line 59) 11166 * magit-version <1>: Debugging Tools. (line 11) 11167 * magit-visit-ref: References Buffer. (line 159) 11168 * magit-wip-commit: Wip Modes. (line 85) 11169 * magit-wip-log: Wip Modes. (line 47) 11170 * magit-wip-log-current: Wip Modes. (line 55) 11171 * magit-worktree: Worktree. (line 9) 11172 * magit-worktree-branch: Worktree. (line 16) 11173 * magit-worktree-checkout: Worktree. (line 13) 11174 * magit-worktree-delete: Worktree. (line 22) 11175 * magit-worktree-move: Worktree. (line 19) 11176 * magit-worktree-status: Worktree. (line 26) 11177 * scroll-down: Commands Available in Diffs. 11178 (line 56) 11179 * scroll-up: Commands Available in Diffs. 11180 (line 53) 11181 * with-editor-cancel: Editing Commit Messages. 11182 (line 22) 11183 * with-editor-cancel <1>: Editing Rebase Sequences. 11184 (line 11) 11185 * with-editor-debug: Debugging Tools. (line 64) 11186 * with-editor-finish: Editing Commit Messages. 11187 (line 18) 11188 * with-editor-finish <1>: Editing Rebase Sequences. 11189 (line 7) 11190 * with-editor-usage-message: Commit Mode and Hooks. 11191 (line 51) 11192 11193 11194 File: magit.info, Node: Variable Index, Prev: Function and Command Index, Up: Top 11195 11196 Appendix E Variable Index 11197 ************************* 11198 11199 11200 * Menu: 11201 11202 * auto-revert-buffer-list-filter: Automatic Reverting of File-Visiting Buffers. 11203 (line 73) 11204 * auto-revert-interval: Automatic Reverting of File-Visiting Buffers. 11205 (line 69) 11206 * auto-revert-mode: Automatic Reverting of File-Visiting Buffers. 11207 (line 57) 11208 * auto-revert-stop-on-user-input: Automatic Reverting of File-Visiting Buffers. 11209 (line 65) 11210 * auto-revert-use-notify: Automatic Reverting of File-Visiting Buffers. 11211 (line 46) 11212 * auto-revert-verbose: Automatic Reverting of File-Visiting Buffers. 11213 (line 94) 11214 * branch.autoSetupMerge: Branch Git Variables. 11215 (line 71) 11216 * branch.autoSetupRebase: Branch Git Variables. 11217 (line 85) 11218 * branch.NAME.description: Branch Git Variables. 11219 (line 42) 11220 * branch.NAME.merge: Branch Git Variables. 11221 (line 10) 11222 * branch.NAME.pushRemote: Branch Git Variables. 11223 (line 29) 11224 * branch.NAME.rebase: Branch Git Variables. 11225 (line 20) 11226 * branch.NAME.remote: Branch Git Variables. 11227 (line 15) 11228 * core.notesRef: Notes. (line 53) 11229 * git-commit-finish-query-functions: Commit Message Conventions. 11230 (line 18) 11231 * git-commit-known-pseudo-headers: Commit Pseudo Headers. 11232 (line 9) 11233 * git-commit-major-mode: Commit Mode and Hooks. 11234 (line 12) 11235 * git-commit-post-finish-hook: Commit Mode and Hooks. 11236 (line 54) 11237 * git-commit-setup-hook: Commit Mode and Hooks. 11238 (line 21) 11239 * git-commit-style-convention-checks: Commit Message Conventions. 11240 (line 38) 11241 * git-commit-summary-max-length: Commit Message Conventions. 11242 (line 13) 11243 * git-rebase-auto-advance: Editing Rebase Sequences. 11244 (line 80) 11245 * git-rebase-confirm-cancel: Editing Rebase Sequences. 11246 (line 86) 11247 * git-rebase-show-instructions: Editing Rebase Sequences. 11248 (line 83) 11249 * global-auto-revert-mode: Automatic Reverting of File-Visiting Buffers. 11250 (line 21) 11251 * magit-auto-revert-immediately: Automatic Reverting of File-Visiting Buffers. 11252 (line 30) 11253 * magit-auto-revert-mode: Automatic Reverting of File-Visiting Buffers. 11254 (line 17) 11255 * magit-auto-revert-tracked-only: Automatic Reverting of File-Visiting Buffers. 11256 (line 51) 11257 * magit-bisect-show-graph: Bisecting. (line 57) 11258 * magit-blame-disable-modes: Blaming. (line 165) 11259 * magit-blame-echo-style: Blaming. (line 151) 11260 * magit-blame-goto-chunk-hook: Blaming. (line 170) 11261 * magit-blame-read-only: Blaming. (line 161) 11262 * magit-blame-styles: Blaming. (line 147) 11263 * magit-blame-time-format: Blaming. (line 157) 11264 * magit-branch-adjust-remote-upstream-alist: Branch Commands. (line 202) 11265 * magit-branch-direct-configure: Branch Commands. (line 19) 11266 * magit-branch-prefer-remote-upstream: Branch Commands. (line 158) 11267 * magit-branch-read-upstream-first: Branch Commands. (line 153) 11268 * magit-buffer-name-format: Naming Buffers. (line 25) 11269 * magit-bury-buffer-function: Quitting Windows. (line 16) 11270 * magit-cherry-margin: Cherries. (line 21) 11271 * magit-clone-always-transient: Cloning Repository. (line 12) 11272 * magit-clone-default-directory: Cloning Repository. (line 84) 11273 * magit-clone-name-alist: Cloning Repository. (line 94) 11274 * magit-clone-set-remote-head: Cloning Repository. (line 66) 11275 * magit-clone-set-remote.pushDefault: Cloning Repository. (line 75) 11276 * magit-clone-url-format: Cloning Repository. (line 114) 11277 * magit-commit-ask-to-stage: Initiating a Commit. (line 65) 11278 * magit-commit-diff-inhibit-same-window: Initiating a Commit. (line 97) 11279 * magit-commit-extend-override-date: Initiating a Commit. (line 72) 11280 * magit-commit-reword-override-date: Initiating a Commit. (line 75) 11281 * magit-commit-show-diff: Initiating a Commit. (line 69) 11282 * magit-commit-squash-confirm: Initiating a Commit. (line 78) 11283 * magit-completing-read-function: Support for Completion Frameworks. 11284 (line 27) 11285 * magit-define-global-key-bindings: Global Bindings. (line 6) 11286 * magit-diff-adjust-tab-width: Diff Options. (line 17) 11287 * magit-diff-buffer-file-locked: Commands for Buffers Visiting Files. 11288 (line 104) 11289 * magit-diff-extra-stat-arguments: Diff Options. (line 112) 11290 * magit-diff-hide-trailing-cr-characters: Diff Options. (line 77) 11291 * magit-diff-highlight-hunk-region-functions: Diff Options. (line 80) 11292 * magit-diff-highlight-indentation: Diff Options. (line 63) 11293 * magit-diff-highlight-trailing: Diff Options. (line 59) 11294 * magit-diff-paint-whitespace: Diff Options. (line 38) 11295 * magit-diff-paint-whitespace-lines: Diff Options. (line 52) 11296 * magit-diff-refine-hunk: Diff Options. (line 6) 11297 * magit-diff-refine-ignore-whitespace: Diff Options. (line 13) 11298 * magit-diff-unmarked-lines-keep-foreground: Diff Options. (line 105) 11299 * magit-diff-visit-previous-blob: Visiting Files and Blobs from a Diff. 11300 (line 38) 11301 * magit-direct-use-buffer-arguments: Transient Arguments and Buffer Variables. 11302 (line 73) 11303 * magit-display-buffer-function: Switching Buffers. (line 25) 11304 * magit-display-buffer-noselect: Switching Buffers. (line 17) 11305 * magit-dwim-selection: Completion and Confirmation. 11306 (line 42) 11307 * magit-ediff-dwim-resolve-function: Ediffing. (line 105) 11308 * magit-ediff-dwim-show-on-hunks: Ediffing. (line 111) 11309 * magit-ediff-quit-hook: Ediffing. (line 124) 11310 * magit-ediff-show-stash-with-index: Ediffing. (line 118) 11311 * magit-generate-buffer-name-function: Naming Buffers. (line 6) 11312 * magit-git-debug: Viewing Git Output. (line 26) 11313 * magit-git-debug <1>: Getting a Value from Git. 11314 (line 68) 11315 * magit-git-executable: Git Executable. (line 26) 11316 * magit-git-global-arguments: Global Git Arguments. 11317 (line 6) 11318 * magit-keep-region-overlay: The Selection. (line 52) 11319 * magit-list-refs-sortby: Additional Completion Options. 11320 (line 6) 11321 * magit-log-auto-more: Log Buffer. (line 69) 11322 * magit-log-buffer-file-locked: Commands for Buffers Visiting Files. 11323 (line 124) 11324 * magit-log-margin: Log Margin. (line 12) 11325 * magit-log-margin-show-committer-date: Log Margin. (line 44) 11326 * magit-log-section-commit-count: Status Sections. (line 118) 11327 * magit-log-select-margin: Select from Log. (line 28) 11328 * magit-log-show-color-graph-limit: Log Buffer. (line 78) 11329 * magit-log-show-refname-after-summary: Log Buffer. (line 74) 11330 * magit-log-show-signatures-limit: Log Buffer. (line 84) 11331 * magit-log-trace-definition-function: Commands Available in Diffs. 11332 (line 17) 11333 * magit-module-sections-hook: Status Module Sections. 11334 (line 19) 11335 * magit-module-sections-nested: Status Module Sections. 11336 (line 22) 11337 * magit-no-confirm: Action Confirmation. (line 18) 11338 * magit-pop-revision-stack-format: Using the Revision Stack. 11339 (line 34) 11340 * magit-post-clone-hook: Cloning Repository. (line 133) 11341 * magit-post-commit-hook: Initiating a Commit. (line 86) 11342 * magit-post-display-buffer-hook: Switching Buffers. (line 85) 11343 * magit-pre-display-buffer-hook: Switching Buffers. (line 76) 11344 * magit-prefer-remote-upstream: Branch Git Variables. 11345 (line 108) 11346 * magit-prefix-use-buffer-arguments: Transient Arguments and Buffer Variables. 11347 (line 65) 11348 * magit-process-extreme-logging: Viewing Git Output. (line 56) 11349 * magit-process-raise-error: Calling Git for Effect. 11350 (line 125) 11351 * magit-pull-or-fetch: Fetching. (line 52) 11352 * magit-reflog-margin: Reflog. (line 20) 11353 * magit-refresh-args: Refreshing Buffers. (line 52) 11354 * magit-refresh-buffer-hook: Automatic Refreshing of Magit Buffers. 11355 (line 41) 11356 * magit-refresh-function: Refreshing Buffers. (line 47) 11357 * magit-refresh-status-buffer: Automatic Refreshing of Magit Buffers. 11358 (line 46) 11359 * magit-refs-filter-alist: References Buffer. (line 137) 11360 * magit-refs-focus-column-width: References Buffer. (line 75) 11361 * magit-refs-margin: References Buffer. (line 89) 11362 * magit-refs-margin-for-tags: References Buffer. (line 112) 11363 * magit-refs-pad-commit-counts: References Buffer. (line 45) 11364 * magit-refs-primary-column-width: References Buffer. (line 63) 11365 * magit-refs-sections-hook: References Sections. (line 13) 11366 * magit-refs-show-commit-count: References Buffer. (line 36) 11367 * magit-refs-show-remote-prefix: References Buffer. (line 57) 11368 * magit-remote-add-set-remote.pushDefault: Remote Commands. (line 83) 11369 * magit-remote-direct-configure: Remote Commands. (line 20) 11370 * magit-remote-git-executable: Git Executable. (line 32) 11371 * magit-repolist-columns: Repository List. (line 12) 11372 * magit-repository-directories: Status Buffer. (line 57) 11373 * magit-revision-filter-files-on-follow: Revision Buffer. (line 55) 11374 * magit-revision-insert-related-refs: Revision Buffer. (line 6) 11375 * magit-revision-show-gravatars: Revision Buffer. (line 15) 11376 * magit-revision-use-hash-sections: Revision Buffer. (line 31) 11377 * magit-root-section: Matching Sections. (line 81) 11378 * magit-save-repository-buffers: Automatic Saving of File-Visiting Buffers. 11379 (line 13) 11380 * magit-section-cache-visibility: Section Visibility. (line 95) 11381 * magit-section-initial-visibility-alist: Section Visibility. (line 79) 11382 * magit-section-movement-hook: Section Movement. (line 41) 11383 * magit-section-set-visibility-hook: Section Visibility. (line 105) 11384 * magit-section-show-child-count: Section Options. (line 9) 11385 * magit-section-visibility-indicator: Section Visibility. (line 122) 11386 * magit-shell-command-verbose-prompt: Running Git Manually. 11387 (line 43) 11388 * magit-stashes-margin: Stashing. (line 133) 11389 * magit-status-headers-hook: Status Header Sections. 11390 (line 17) 11391 * magit-status-margin: Status Options. (line 6) 11392 * magit-status-sections-hook: Status Sections. (line 10) 11393 * magit-submodule-list-columns: Listing Submodules. (line 20) 11394 * magit-this-process: Calling Git for Effect. 11395 (line 121) 11396 * magit-uniquify-buffer-names: Naming Buffers. (line 65) 11397 * magit-unstage-committed: Staging and Unstaging. 11398 (line 52) 11399 * magit-update-other-window-delay: Section Movement. (line 97) 11400 * magit-visit-ref-behavior: References Buffer. (line 168) 11401 * magit-wip-after-apply-mode: Legacy Wip Modes. (line 18) 11402 * magit-wip-after-apply-mode-lighter: Legacy Wip Modes. (line 54) 11403 * magit-wip-after-save-local-mode-lighter: Legacy Wip Modes. (line 51) 11404 * magit-wip-after-save-mode: Legacy Wip Modes. (line 13) 11405 * magit-wip-before-change-mode: Legacy Wip Modes. (line 31) 11406 * magit-wip-before-change-mode-lighter: Legacy Wip Modes. (line 57) 11407 * magit-wip-initial-backup-mode: Legacy Wip Modes. (line 35) 11408 * magit-wip-initial-backup-mode-lighter: Legacy Wip Modes. (line 60) 11409 * magit-wip-merge-branch: Wip Graph. (line 6) 11410 * magit-wip-mode: Wip Modes. (line 30) 11411 * magit-wip-mode-lighter: Wip Modes. (line 98) 11412 * magit-wip-namespace: Wip Modes. (line 91) 11413 * notes.displayRef: Notes. (line 57) 11414 * pull.rebase: Branch Git Variables. 11415 (line 50) 11416 * remote.NAME.fetch: Remote Git Variables. 11417 (line 14) 11418 * remote.NAME.push: Remote Git Variables. 11419 (line 23) 11420 * remote.NAME.pushurl: Remote Git Variables. 11421 (line 18) 11422 * remote.NAME.tagOpts: Remote Git Variables. 11423 (line 27) 11424 * remote.NAME.url: Remote Git Variables. 11425 (line 10) 11426 * remote.pushDefault: Branch Git Variables. 11427 (line 62) 11428 11429 11430 11431 Tag Table: 11432 Node: Top774 11433 Node: Introduction6559 11434 Node: Installation11275 11435 Node: Installing from Melpa11605 11436 Node: Installing from the Git Repository12680 11437 Node: Post-Installation Tasks15494 11438 Node: Getting Started16779 11439 Node: Interface Concepts22590 11440 Node: Modes and Buffers22969 11441 Node: Switching Buffers24680 11442 Node: Naming Buffers29419 11443 Node: Quitting Windows32494 11444 Node: Automatic Refreshing of Magit Buffers34429 11445 Node: Automatic Saving of File-Visiting Buffers37310 11446 Node: Automatic Reverting of File-Visiting Buffers38494 11447 Node: Risk of Reverting Automatically43479 11448 Node: Sections45861 11449 Node: Section Movement46787 11450 Node: Section Visibility51661 11451 Node: Section Hooks58348 11452 Node: Section Types and Values60754 11453 Node: Section Options62169 11454 Node: Transient Commands62640 11455 Node: Transient Arguments and Buffer Variables64116 11456 Node: Completion Confirmation and the Selection71133 11457 Node: Action Confirmation71579 11458 Node: Completion and Confirmation80084 11459 Node: The Selection83269 11460 Node: The hunk-internal region86167 11461 Node: Support for Completion Frameworks87256 11462 Node: Additional Completion Options92141 11463 Node: Mouse Support92739 11464 Node: Running Git93315 11465 Node: Viewing Git Output93560 11466 Node: Git Process Status96264 11467 Node: Running Git Manually97229 11468 Node: Git Executable99919 11469 Node: Global Git Arguments102927 11470 Node: Inspecting103732 11471 Node: Status Buffer104889 11472 Node: Status Sections109900 11473 Node: Status Header Sections115627 11474 Node: Status Module Sections118246 11475 Node: Status Options120743 11476 Node: Repository List122106 11477 Node: Logging126884 11478 Node: Refreshing Logs129723 11479 Node: Log Buffer131144 11480 Node: Log Margin135967 11481 Node: Select from Log139120 11482 Node: Reflog141330 11483 Node: Cherries142967 11484 Node: Diffing144805 11485 Node: Refreshing Diffs147839 11486 Node: Commands Available in Diffs151528 11487 Node: Diff Options154041 11488 Node: Revision Buffer159504 11489 Node: Ediffing162824 11490 Node: References Buffer168874 11491 Node: References Sections179468 11492 Node: Bisecting180325 11493 Node: Visiting Files and Blobs182636 11494 Node: General-Purpose Visit Commands183164 11495 Node: Visiting Files and Blobs from a Diff184117 11496 Node: Blaming187561 11497 Node: Manipulating194549 11498 Node: Creating Repository194891 11499 Node: Cloning Repository195428 11500 Node: Staging and Unstaging201869 11501 Node: Staging from File-Visiting Buffers205842 11502 Node: Applying206948 11503 Node: Committing209021 11504 Node: Initiating a Commit209604 11505 Node: Editing Commit Messages214794 11506 Node: Using the Revision Stack217567 11507 Node: Commit Pseudo Headers220612 11508 Node: Commit Mode and Hooks221907 11509 Node: Commit Message Conventions224765 11510 Node: Branching226752 11511 Node: The Two Remotes226978 11512 Node: Branch Commands229631 11513 Node: Branch Git Variables242481 11514 Node: Auxiliary Branch Commands247851 11515 Node: Merging248967 11516 Node: Resolving Conflicts253123 11517 Node: Rebasing258497 11518 Node: Editing Rebase Sequences263286 11519 Node: Information About In-Progress Rebase267502 11520 Ref: Information About In-Progress Rebase-Footnote-1276615 11521 Node: Cherry Picking277211 11522 Node: Reverting281545 11523 Node: Resetting282964 11524 Node: Stashing284790 11525 Node: Transferring291567 11526 Node: Remotes291789 11527 Node: Remote Commands291941 11528 Node: Remote Git Variables295980 11529 Node: Fetching297251 11530 Node: Pulling299734 11531 Node: Pushing300760 11532 Node: Plain Patches305051 11533 Node: Maildir Patches306522 11534 Node: Miscellaneous308001 11535 Node: Tagging308347 11536 Node: Notes310240 11537 Node: Submodules312575 11538 Node: Listing Submodules312793 11539 Node: Submodule Transient314941 11540 Node: Subtree317386 11541 Node: Worktree319317 11542 Node: Sparse checkouts320393 11543 Node: Bundle323169 11544 Node: Common Commands323544 11545 Node: Wip Modes326172 11546 Node: Wip Graph331063 11547 Node: Legacy Wip Modes333376 11548 Node: Commands for Buffers Visiting Files336263 11549 Node: Minor Mode for Buffers Visiting Blobs344490 11550 Node: Customizing345288 11551 Node: Per-Repository Configuration346884 11552 Node: Essential Settings349138 11553 Node: Safety349484 11554 Node: Performance351245 11555 Ref: Log Performance354208 11556 Ref: Diff Performance355513 11557 Ref: Refs Buffer Performance356854 11558 Ref: Committing Performance357429 11559 Node: Microsoft Windows Performance358411 11560 Node: MacOS Performance359602 11561 Ref: MacOS Performance-Footnote-1360625 11562 Node: Global Bindings360707 11563 Node: Plumbing362935 11564 Node: Calling Git363764 11565 Node: Getting a Value from Git365289 11566 Node: Calling Git for Effect369017 11567 Node: Section Plumbing374911 11568 Node: Creating Sections375139 11569 Node: Section Selection379035 11570 Node: Matching Sections380831 11571 Node: Refreshing Buffers386752 11572 Node: Conventions389896 11573 Node: Theming Faces390088 11574 Node: FAQ398193 11575 Node: FAQ - How to ...?398631 11576 Node: How to pronounce Magit?398988 11577 Node: How to show git's output?399791 11578 Node: How to install the gitman info manual?400577 11579 Node: How to show diffs for gpg-encrypted files?401547 11580 Node: How does branching and pushing work?402143 11581 Node: Should I disable VC?402476 11582 Node: FAQ - Issues and Errors403079 11583 Node: Magit is slow404024 11584 Node: I changed several thousand files at once and now Magit is unusable404317 11585 Node: I am having problems committing405043 11586 Node: I am using MS Windows and cannot push with Magit405524 11587 Node: I am using macOS and SOMETHING works in shell but not in Magit406142 11588 Node: Expanding a file to show the diff causes it to disappear406976 11589 Node: Point is wrong in the COMMIT_EDITMSG buffer407564 11590 Node: The mode-line information isn't always up-to-date408612 11591 Node: A branch and tag sharing the same name breaks SOMETHING409675 11592 Node: My Git hooks work on the command-line but not inside Magit410562 11593 Node: git-commit-mode isn't used when committing from the command-line411408 11594 Node: Point ends up inside invisible text when jumping to a file-visiting buffer413679 11595 Node: I am no longer able to save popup defaults414528 11596 Node: Debugging Tools415509 11597 Node: Keystroke Index418683 11598 Node: Function and Command Index460297 11599 Node: Variable Index518498 11600 11601 End Tag Table 11602 11603 11604 Local Variables: 11605 coding: utf-8 11606 End: