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

Use :Git not :G for visible maps

Browse Source 
Let's treat :Git as canonical and :G as the shorthand.
This commit is contained in:
Tim Pope
2019-08-22 19:45:13 -05:00
parent 3a01f4b819
commit 410e17129d
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
autoload/fugitive.vim
View File

@@ -5474,10 +5474,10 @@ function! fugitive#MapJumps(...) abort
call s:Map('n', 'gi', ":<C-U>exe 'Gsplit' (v:count ? '.gitignore' : '.git/info/exclude')<CR>", '<silent>') call s:Map('n', 'gi', ":<C-U>exe 'Gsplit' (v:count ? '.gitignore' : '.git/info/exclude')<CR>", '<silent>')
call s:Map('x', 'gi', ":<C-U>exe 'Gsplit' (v:count ? '.gitignore' : '.git/info/exclude')<CR>", '<silent>') call s:Map('x', 'gi', ":<C-U>exe 'Gsplit' (v:count ? '.gitignore' : '.git/info/exclude')<CR>", '<silent>')
nnoremap <buffer> c<Space> :Gcommit<Space> nnoremap <buffer> c<Space> :Git commit<Space>
nnoremap <buffer> c<CR> :Gcommit<CR> nnoremap <buffer> c<CR> :Git commit<CR>
nnoremap <buffer> cv<Space> :Gcommit -v<Space> nnoremap <buffer> cv<Space> :Git commit -v<Space>
nnoremap <buffer> cv<CR> :Gcommit -v<CR> nnoremap <buffer> cv<CR> :Git commit -v<CR>
nnoremap <buffer> <silent> ca :<C-U>Gcommit --amend<CR> nnoremap <buffer> <silent> ca :<C-U>Gcommit --amend<CR>
nnoremap <buffer> <silent> cc :<C-U>Gcommit<CR> nnoremap <buffer> <silent> cc :<C-U>Gcommit<CR>
nnoremap <buffer> <silent> ce :<C-U>Gcommit --amend --no-edit<CR> nnoremap <buffer> <silent> ce :<C-U>Gcommit --amend --no-edit<CR>
@@ -5494,18 +5494,18 @@ function! fugitive#MapJumps(...) abort
nnoremap <buffer> cA :<C-U>Gcommit --edit --squash=<C-R>=<SID>SquashArgument()<CR> nnoremap <buffer> cA :<C-U>Gcommit --edit --squash=<C-R>=<SID>SquashArgument()<CR>
nnoremap <buffer> <silent> c? :<C-U>help fugitive_c<CR> nnoremap <buffer> <silent> c? :<C-U>help fugitive_c<CR>
nnoremap <buffer> cr<Space> :Grevert<Space> nnoremap <buffer> cr<Space> :Git revert<Space>
nnoremap <buffer> cr<CR> :Grevert<CR> nnoremap <buffer> cr<CR> :Git revert<CR>
nnoremap <buffer> <silent> crc :<C-U>Grevert <C-R>=<SID>SquashArgument()<CR><CR> nnoremap <buffer> <silent> crc :<C-U>Grevert <C-R>=<SID>SquashArgument()<CR><CR>
nnoremap <buffer> <silent> crn :<C-U>Grevert --no-commit <C-R>=<SID>SquashArgument()<CR><CR> nnoremap <buffer> <silent> crn :<C-U>Grevert --no-commit <C-R>=<SID>SquashArgument()<CR><CR>
nnoremap <buffer> <silent> cr? :help fugitive_cr<CR> nnoremap <buffer> <silent> cr? :help fugitive_cr<CR>
nnoremap <buffer> cm<Space> :Gmerge<Space> nnoremap <buffer> cm<Space> :Git merge<Space>
nnoremap <buffer> cm<CR> :Gmerge<CR> nnoremap <buffer> cm<CR> :Git merge<CR>
nnoremap <buffer> <silent> cm? :help fugitive_cm<CR> nnoremap <buffer> <silent> cm? :help fugitive_cm<CR>
nnoremap <buffer> cz<Space> :G stash<Space> nnoremap <buffer> cz<Space> :Git stash<Space>
nnoremap <buffer> cz<CR> :G stash<CR> nnoremap <buffer> cz<CR> :Git stash<CR>
nnoremap <buffer> <silent> cza :<C-U>exe <SID>EchoExec(['stash', 'apply', '--quiet', '--index', 'stash@{' . v:count . '}'])<CR> nnoremap <buffer> <silent> cza :<C-U>exe <SID>EchoExec(['stash', 'apply', '--quiet', '--index', 'stash@{' . v:count . '}'])<CR>
nnoremap <buffer> <silent> czA :<C-U>exe <SID>EchoExec(['stash', 'apply', '--quiet', 'stash@{' . v:count . '}'])<CR> nnoremap <buffer> <silent> czA :<C-U>exe <SID>EchoExec(['stash', 'apply', '--quiet', 'stash@{' . v:count . '}'])<CR>
nnoremap <buffer> <silent> czp :<C-U>exe <SID>EchoExec(['stash', 'pop', '--quiet', '--index', 'stash@{' . v:count . '}'])<CR> nnoremap <buffer> <silent> czp :<C-U>exe <SID>EchoExec(['stash', 'pop', '--quiet', '--index', 'stash@{' . v:count . '}'])<CR>
@@ -5515,17 +5515,17 @@ function! fugitive#MapJumps(...) abort
nnoremap <buffer> <silent> czz :<C-U>exe <SID>EchoExec(['stash'] + (v:count > 1 ? ['--all'] : v:count ? ['--include-untracked'] : []))<CR> nnoremap <buffer> <silent> czz :<C-U>exe <SID>EchoExec(['stash'] + (v:count > 1 ? ['--all'] : v:count ? ['--include-untracked'] : []))<CR>
nnoremap <buffer> <silent> cz? :<C-U>help fugitive_cz<CR> nnoremap <buffer> <silent> cz? :<C-U>help fugitive_cz<CR>
nnoremap <buffer> co<Space> :G checkout<Space> nnoremap <buffer> co<Space> :Git checkout<Space>
nnoremap <buffer> co<CR> :G checkout<CR> nnoremap <buffer> co<CR> :Git checkout<CR>
nnoremap <buffer> coo :exe <SID>EchoExec(['checkout'] + split(<SID>SquashArgument()) + ['--'])<CR> nnoremap <buffer> coo :exe <SID>EchoExec(['checkout'] + split(<SID>SquashArgument()) + ['--'])<CR>
nnoremap <buffer> co? :<C-U>help fugitive_co<CR> nnoremap <buffer> co? :<C-U>help fugitive_co<CR>
nnoremap <buffer> cb<Space> :G branch<Space> nnoremap <buffer> cb<Space> :Git branch<Space>
nnoremap <buffer> cb<CR> :G branch<CR> nnoremap <buffer> cb<CR> :Git branch<CR>
nnoremap <buffer> cb? :<C-U>help fugitive_cb<CR> nnoremap <buffer> cb? :<C-U>help fugitive_cb<CR>
nnoremap <buffer> r<Space> :Grebase<Space> nnoremap <buffer> r<Space> :Git rebase<Space>
nnoremap <buffer> r<CR> :Grebase<CR> nnoremap <buffer> r<CR> :Git rebase<CR>
nnoremap <buffer> <silent> ri :<C-U>Grebase --interactive<C-R>=<SID>RebaseArgument()<CR><CR> nnoremap <buffer> <silent> ri :<C-U>Grebase --interactive<C-R>=<SID>RebaseArgument()<CR><CR>
nnoremap <buffer> <silent> rf :<C-U>Grebase --autosquash<C-R>=<SID>RebaseArgument()<CR><CR> nnoremap <buffer> <silent> rf :<C-U>Grebase --autosquash<C-R>=<SID>RebaseArgument()<CR><CR>
nnoremap <buffer> <silent> ru :<C-U>Grebase --interactive @{upstream}<CR> nnoremap <buffer> <silent> ru :<C-U>Grebase --interactive @{upstream}<CR>

14
doc/fugitive.txt
View File

@@ -455,7 +455,7 @@ cS Create a `squash!` commit for the commit under the
cA Create a `squash!` commit for the commit under the cA Create a `squash!` commit for the commit under the
cursor and edit the message. cursor and edit the message.
c<Space> Populate command line with ":Gcommit ". c<Space> Populate command line with ":Git commit ".
*fugitive_cr* *fugitive_cr*
crc Revert the commit under the cursor. crc Revert the commit under the cursor.
@@ -463,10 +463,10 @@ crc Revert the commit under the cursor.
crn Revert the commit under the cursor in the index and crn Revert the commit under the cursor in the index and
work tree, but do not actually commit the changes. work tree, but do not actually commit the changes.
cr<Space> Populate command line with ":Grevert ". cr<Space> Populate command line with ":Git revert ".
*fugitive_cm* *fugitive_cm*
cm<Space> Populate command line with ":Gmerge ". cm<Space> Populate command line with ":Git merge ".
c? Show this help. c? Show this help.
@@ -476,9 +476,9 @@ Checkout/branch mappings ~
coo Check out the commit under the cursor. coo Check out the commit under the cursor.
cb<Space> Populate command line with ":G branch ". cb<Space> Populate command line with ":Git branch ".
co<Space> Populate command line with ":G checkout ". co<Space> Populate command line with ":Git checkout ".
cb? Show this help. cb? Show this help.
co? co?
@@ -502,7 +502,7 @@ czP Pop topmost stash, or stash@{count}.
czp Pop topmost stash, or stash@{count}, preserving the czp Pop topmost stash, or stash@{count}, preserving the
index. index.
cz<Space> Populate command line with ":G stash ". cz<Space> Populate command line with ":Git stash ".
cz? Show this help. cz? Show this help.
@@ -538,7 +538,7 @@ rm Perform an interactive rebase with the commit under
rd Perform an interactive rebase with the commit under rd Perform an interactive rebase with the commit under
the cursor set to `drop`. the cursor set to `drop`.
r<Space> Populate command line with ":Grebase ". r<Space> Populate command line with ":Git rebase ".
r? Show this help. r? Show this help.