|
1 |
| -*filetype.txt* For Vim version 9.1. Last change: 2025 Mar 10 |
| 1 | +*filetype.txt* For Vim version 9.1. Last change: 2025 Mar 15 |
2 | 2 |
|
3 | 3 |
|
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar
|
@@ -640,6 +640,25 @@ One command, :DiffGitCached, is provided to show a diff of the current commit
|
640 | 640 | in the preview window. It is equivalent to calling "git diff --cached" plus
|
641 | 641 | any arguments given to the command.
|
642 | 642 |
|
| 643 | +GIT REBASE *ft-gitrebase-plugin* |
| 644 | + |
| 645 | +The gitrebase filetype defines the following buffer-local commands, to help |
| 646 | +with interactive `git rebase`: > |
| 647 | +
|
| 648 | + :Drop " to discard this commit |
| 649 | + :Edit " to stop for editing this commit |
| 650 | + :Fixup " to squash (but discard the message) into the previous one |
| 651 | + :Pick " to pick this commit (the cursor is on) |
| 652 | + :Reword " to pick this commit, but change the commit message |
| 653 | + :Squash " to squash this commit into the previous one |
| 654 | +
|
| 655 | +In addition, the following command can be used to cycle between the different |
| 656 | +possibilities: > |
| 657 | +
|
| 658 | + :Cycle " to cycle between the previous commands |
| 659 | +< |
| 660 | +The `:Cycle` command is also mapped to the CTRL-A and CTRL-X keys. |
| 661 | +For details, see `git-rebase --help`. |
643 | 662 |
|
644 | 663 | GO *ft-go-plugin*
|
645 | 664 |
|
@@ -776,7 +795,7 @@ Local mappings:
|
776 | 795 | to the end of the file in Normal mode. This means "> " is inserted in
|
777 | 796 | each line.
|
778 | 797 |
|
779 |
| -MAN *ft-man-plugin* *:Man* *:ManReload* *man.vim* |
| 798 | +MAN *ft-man-plugin* *:Man* *:ManReload* *man.vim* |
780 | 799 |
|
781 | 800 | This plugin displays a manual page in a nice way. See |find-manpage| in the
|
782 | 801 | user manual for more information.
|
|
0 commit comments