Change subtopic help tag style from :Git- to :Git_

This is less Git-like, but a bit more Vim-like, and doesn't force us
into the awkward :Git---paginate.
This commit is contained in:
Tim Pope
2020-02-29 07:58:30 -05:00
parent 025151bc78
commit d0dceb9feb
2 changed files with 20 additions and 19 deletions

View File

@@ -5555,8 +5555,8 @@ function! s:BlameFileType() abort
if &modifiable if &modifiable
return '' return ''
endif endif
call s:Map('n', '<F1>', ':help :Gblame<CR>', '<silent>') call s:Map('n', '<F1>', ':help :Git_blame<CR>', '<silent>')
call s:Map('n', 'g?', ':help :Gblame<CR>', '<silent>') call s:Map('n', 'g?', ':help :Git_blame<CR>', '<silent>')
if mapcheck('q', 'n') =~# '^$\|bdelete' if mapcheck('q', 'n') =~# '^$\|bdelete'
call s:Map('n', 'q', ':exe <SID>BlameQuit()<Bar>echohl WarningMsg<Bar>echo ":Gblame q is deprecated in favor of gq"<Bar>echohl NONE<CR>', '<silent>') call s:Map('n', 'q', ':exe <SID>BlameQuit()<Bar>echohl WarningMsg<Bar>echo ":Gblame q is deprecated in favor of gq"<Bar>echohl NONE<CR>', '<silent>')
endif endif

View File

@@ -25,6 +25,7 @@ that are part of Git repositories).
resume running the command. A few Git subcommands resume running the command. A few Git subcommands
have different behavior; these are documented below. have different behavior; these are documented below.
*:Git_--paginate* *:Git_-p*
:Git --paginate {args} Run an arbitrary git command, capture output to a temp :Git --paginate {args} Run an arbitrary git command, capture output to a temp
:Git -p {args} file, and |:split| that temp file. Use :0Git to :Git -p {args} file, and |:split| that temp file. Use :0Git to
:G --paginate {args} |:edit| the temp file instead. A temp file is always :G --paginate {args} |:edit| the temp file instead. A temp file is always
@@ -37,7 +38,7 @@ that are part of Git repositories).
:G akin to git-status. Press g? or see |fugitive-maps| :G akin to git-status. Press g? or see |fugitive-maps|
for usage. for usage.
*:Git-blame* *:Git_blame*
:Git blame [flags] Run git-blame [flags] on the current file and open the :Git blame [flags] Run git-blame [flags] on the current file and open the
results in a scroll-bound vertical split. The results in a scroll-bound vertical split. The
following maps, which work on the cursor line commit following maps, which work on the cursor line commit
@@ -63,7 +64,7 @@ that are part of Git repositories).
scrollbinding is used. You can also give an arbitrary scrollbinding is used. You can also give an arbitrary
filename. filename.
*:Ggrep* *:Gcgrep* *:Git-grep* *:Ggrep* *:Gcgrep* *:Git_grep*
:Ggrep[!] [args] |:grep|[!] with git-grep as 'grepprg'. :Ggrep[!] [args] |:grep|[!] with git-grep as 'grepprg'.
:Git[!] grep [args] :Git[!] grep [args]
@@ -71,7 +72,7 @@ that are part of Git repositories).
:Glgrep[!] [args] |:lgrep|[!] with git-grep as 'grepprg'. :Glgrep[!] [args] |:lgrep|[!] with git-grep as 'grepprg'.
:0Git[!] grep [args] :0Git[!] grep [args]
*:Git-difftool* *:Git_difftool*
:Git[!] difftool [args] Invoke `git diff [args]` and load the changes into the :Git[!] difftool [args] Invoke `git diff [args]` and load the changes into the
quickfix list. Each changed hunk gets a separate quickfix list. Each changed hunk gets a separate
quickfix entry unless you pass an option like quickfix entry unless you pass an option like
@@ -82,17 +83,17 @@ that are part of Git repositories).
new tab, and invoke `:Gdiffsplit!` against the new tab, and invoke `:Gdiffsplit!` against the
appropriate commit. appropriate commit.
*:Git-mergetool* *:Git_mergetool*
:Git mergetool [args] Like |:Git-difftool|, but target merge conflicts. :Git mergetool [args] Like |:Git_difftool|, but target merge conflicts.
*:Git-push* *:Git_push*
:Git push [args] Invoke git-push, load the results into the |quickfix| :Git push [args] Invoke git-push, load the results into the |quickfix|
list, and invoke |:cwindow| to reveal any errors. list, and invoke |:cwindow| to reveal any errors.
|:Dispatch| is used if available for asynchronous |:Dispatch| is used if available for asynchronous
invocation. invocation.
*:Git-fetch* *:Git_fetch*
:Git fetch [args] Like |:Git-push|, but for git-fetch. :Git fetch [args] Like |:Git_push|, but for git-fetch.
*:Gclog* *:Gclog*
:Gclog[!] [args] Use git-log [args] to load the commit history into the :Gclog[!] [args] Use git-log [args] to load the commit history into the
@@ -619,23 +620,23 @@ just one space character longer than the legacy version.
*:Gmove* Superseded by |:GMove|. *:Gmove* Superseded by |:GMove|.
*:Grename* Superseded by |:GRename|. *:Grename* Superseded by |:GRename|.
*:Gbrowse* Superseded by |:GBrowse|. *:Gbrowse* Superseded by |:GBrowse|.
*:Gcommit* Superseded by |:Git| commit.
*:Gdiff* Superseded by |:Gdiffsplit| *:Gdiff* Superseded by |:Gdiffsplit|
*:Gsdiff* Superseded by |:Ghdiffsplit| *:Gsdiff* Superseded by |:Ghdiffsplit|
*:Gvdiff* Superseded by |:Gvdiffsplit| or |:vert| |:Gdiffsplit|. *:Gvdiff* Superseded by |:Gvdiffsplit| or |:vert| |:Gdiffsplit|.
*:Gblame* Superseded by |:Git-blame|. *:Gblame* Superseded by |:Git_blame|.
*:Gmerge* Superseded by |:Git| merge and |:Git-mergetool|. *:Gcommit* Superseded by |:Git| commit.
*:Gmerge* Superseded by |:Git| merge and |:Git_mergetool|.
*:Gpull* Superseded by |:Git| pull. *:Gpull* Superseded by |:Git| pull.
*:Grebase* Superseded by |:Git| rebase. *:Grebase* Superseded by |:Git| rebase.
*:Grevert* Superseded by |:Git| revert. *:Grevert* Superseded by |:Git| revert.
*:Gpush* Superseded by |:Git-push|. *:Gpush* Superseded by |:Git_push|.
*:Gfetch* Superseded by |:Git-fetch|. *:Gfetch* Superseded by |:Git_fetch|.
*:Glog* Superseded by |:Gclog|. *:Glog* Superseded by |:Gclog|.
*:Gstatus* Superseded by |:Git| (with no arguments). *:Gstatus* Superseded by |:Git| (with no arguments).
*:Git!* Superseded by |:Git| --paginate. *:Git!* Superseded by |:Git_--paginate|.
*:Gsplit!* Superseded by |:Git| --paginate. *:Gsplit!* Superseded by |:Git_--paginate|.
*:Gvsplit!* Superseded by |:vert| |:Git| --paginate. *:Gvsplit!* Superseded by :vert Git --paginate.
*:Gtabsplit!* Superseded by |:tab| |:Git| --paginate. *:Gtabsplit!* Superseded by :tab Git --paginate.
*:Gpedit!* Superseded by :Git! --paginate. *:Gpedit!* Superseded by :Git! --paginate.
ABOUT *fugitive-about* ABOUT *fugitive-about*