m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-12 05:13:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Standardize on "maps", not "mappings"

Browse Source
This commit is contained in:
Tim Pope
2019-09-05 15:26:01 -04:00
parent 2d0df5842a
commit eb04d8bcc0
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.markdown
View File

@@ -4,8 +4,8 @@ I'm not going to lie to you; fugitive.vim may very well be the best
Git wrapper of all time. Check out these features:
Bring up an enhanced version of `git status` with `:G` (also known as
`:Gstatus`). Press `g?` to bring up a list of mappings for numerous
operations including diffing, staging, committing, rebasing, and stashing.
`:Gstatus`). Press `g?` to bring up a list of maps for numerous operations
including diffing, staging, committing, rebasing, and stashing.
View any blob, tree, commit, or tag in the repository with `:Gedit` (and
`:Gsplit`, `:Gvsplit`, `:Gtabedit`, ...). Edit a file in the index and

4
autoload/fugitive.vim
View File

@@ -5506,8 +5506,8 @@ function! fugitive#MapJumps(...) abort
call s:Map('n', '.', ":<C-U> <C-R>=<SID>fnameescape(fugitive#Real(@%))<CR><Home>")
call s:Map('x', '.', ":<C-U> <C-R>=<SID>fnameescape(fugitive#Real(@%))<CR><Home>")
call s:Map('n', 'g?', ":<C-U>help fugitive-mappings<CR>", '<silent>')
call s:Map('n', '<F1>', ":<C-U>help fugitive-mappings<CR>", '<silent>')
call s:Map('n', 'g?', ":<C-U>help fugitive-map<CR>", '<silent>')
call s:Map('n', '<F1>', ":<C-U>help fugitive-map<CR>", '<silent>')
endif
endfunction

36
doc/fugitive.txt
View File

@@ -28,7 +28,7 @@ that are part of Git repositories).
*:Gstatus*
:Git Bring up a summary window vaguely akin to git-status.
:G Press g? or see |fugitive-mappings| for usage.
:G Press g? or see |fugitive-maps| for usage.
:Gstatus
*:Git-commit* *:Gcommit*
@@ -249,15 +249,15 @@ that are part of Git repositories).
:[range]Gbrowse! [args] Like :Gbrowse, but put the URL on the clipboard rather
than opening it.
MAPPINGS *fugitive-mappings*
MAPS *fugitive-maps*
These mappings are available in both the |:Gstatus| buffer and Fugitive object
buffers, although not all mappings make sense in all buffers. Mappings that
These maps are available in both the |:Gstatus| buffer and Fugitive object
buffers, although not all maps make sense in all buffers. Mappings that
operate on the file or hunk under the cursor are generally available in visual
mode to operate on multiple files or partial hunks.
*fugitive-staging-mappings*
Staging/unstaging mappings ~
*fugitive-staging-maps*
Staging/unstaging maps ~
*fugitive_s*
s Stage (add) the file or hunk under the cursor.
@@ -299,7 +299,7 @@ P under the cursor. On untracked files, this instead
calls |:Git| add --intent-to-add.
*fugitive_d*
Diff mappings ~
Diff maps ~
*fugitive_dp*
dp Invoke |:Git!| diff on the file under the cursor.
Deprecated in favor of inline diffs.
@@ -320,8 +320,8 @@ dq Close all but one diff buffer, and |:diffoff|! the
*fugitive_d?*
d? Show this help.
*fugitive-navigation-mappings*
Navigation mappings ~
*fugitive-navigation-maps*
Navigation maps ~
*fugitive_<CR>*
<CR> Open the file or |fugitive-object| under the cursor.
@@ -431,7 +431,7 @@ gi Open .git/info/exclude in a split. Use a count to
open .gitignore.
*fugitive_c*
Commit mappings ~
Commit maps ~
cc Create a commit.
@@ -477,7 +477,7 @@ c? Show this help.
*fugitive_cb*
*fugitive_co*
Checkout/branch mappings ~
Checkout/branch maps ~
coo Check out the commit under the cursor.
@@ -489,7 +489,7 @@ cb? Show this help.
co?
*fugitive_cz*
Stash mappings ~
Stash maps ~
czz Push stash. Pass a [count] of 1 to add
`--include-untracked` or 2 to add `--all`.
@@ -512,7 +512,7 @@ cz<Space> Populate command line with ":Git stash ".
cz? Show this help.
*fugitive_r*
Rebase mappings ~
Rebase maps ~
ri Perform an interactive rebase. Uses ancestor of
u commit under cursor as upstream if available.
@@ -547,8 +547,8 @@ r<Space> Populate command line with ":Git rebase ".
r? Show this help.
*fugitive-misc-mappings*
Miscellaneous mappings ~
*fugitive-misc-maps*
Miscellaneous maps ~
*fugitive_gq* *fugitive_q*
gq Close the status buffer.
@@ -558,10 +558,10 @@ gq Close the status buffer.
cursor prepopulated.
*fugitive_g?*
g? Show help for |fugitive-mappings|.
g? Show help for |fugitive-maps|.
*fugitive-global-mappings*
Global mappings ~
*fugitive-global-maps*
Global maps ~
*fugitive_c_CTRL-R_CTRL-G*
<C-R><C-G> On the command line, recall the path to the current