+ flog
This commit is contained in:
parent
bdfd2b722b
commit
c4f8df5765
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -104,3 +104,6 @@
|
|||||||
[submodule "pack/qml/opt/qml"]
|
[submodule "pack/qml/opt/qml"]
|
||||||
path = pack/qml/opt/qml
|
path = pack/qml/opt/qml
|
||||||
url = https://github.com/peterhoeg/vim-qml.git
|
url = https://github.com/peterhoeg/vim-qml.git
|
||||||
|
[submodule "pack/flog/opt/flog"]
|
||||||
|
path = pack/flog/opt/flog
|
||||||
|
url = https://github.com/rbong/vim-flog.git
|
||||||
|
1
pack/flog/opt/flog
Submodule
1
pack/flog/opt/flog
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 97c3047ebb86fb21283fc88d70186f505bbbcde3
|
7
vimfiles.stefan/after/ftplugin/floggraph.vim
Normal file
7
vimfiles.stefan/after/ftplugin/floggraph.vim
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
" settings for flog
|
||||||
|
|
||||||
|
nmap <buffer> <silent> rb :call flog#run_command('Git reset %h', 1, 1)<CR>
|
||||||
|
nmap <buffer> <silent> rbh :call flog#run_command('Git reset --hard %h', 1, 1)<CR>
|
||||||
|
|
||||||
|
nmap <buffer> <silent> cp :call flog#run_command('Git cherry-pick %h', 1, 1)<CR>
|
||||||
|
"nmap <buffer> <silent> d :call flog#run_command('Git cherry-pick %h', 1, 1)<CR>
|
@ -1,4 +0,0 @@
|
|||||||
" settings for fugitive / gitv
|
|
||||||
|
|
||||||
setlocal encoding=utf-8
|
|
||||||
"delcommand Make
|
|
@ -32,6 +32,41 @@ if !exists('nobmsk')
|
|||||||
execute 'source ' . expand(g:vimfiles . '/vimrc.bmsk')
|
execute 'source ' . expand(g:vimfiles . '/vimrc.bmsk')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
" ------------------
|
||||||
|
" packages / plugins
|
||||||
|
" ------------------
|
||||||
|
packadd! asyncrun
|
||||||
|
packadd! conque
|
||||||
|
"packadd! diffchar
|
||||||
|
packadd! dirdiff
|
||||||
|
packadd! DoxygenToolkit
|
||||||
|
packadd! flake8
|
||||||
|
packadd! flog
|
||||||
|
packadd! fugitive
|
||||||
|
"packadd! gdb-from-vim
|
||||||
|
packadd! gundo
|
||||||
|
packadd! isort
|
||||||
|
packadd! linediff
|
||||||
|
packadd! merginal
|
||||||
|
"packadd! pyclewn
|
||||||
|
"packadd! pylint
|
||||||
|
packadd! python-pep8-indent
|
||||||
|
packadd! qml
|
||||||
|
packadd! rtags
|
||||||
|
packadd! sessionman
|
||||||
|
packadd! SrchRplcHiGrp
|
||||||
|
packadd! syntastic
|
||||||
|
packadd! tagbar
|
||||||
|
"packadd! tail
|
||||||
|
packadd! tcomment
|
||||||
|
packadd! termdebug
|
||||||
|
packadd! vc
|
||||||
|
packadd! vimagit
|
||||||
|
packadd! VisIncr
|
||||||
|
packadd! xml
|
||||||
|
packadd! yapf
|
||||||
|
packadd! YouCompleteMe
|
||||||
|
|
||||||
" global settings
|
" global settings
|
||||||
" ---------------
|
" ---------------
|
||||||
set nobackup " keep no backup file
|
set nobackup " keep no backup file
|
||||||
@ -244,11 +279,6 @@ let g:tcomment#options = {'col': 1, 'whitespace': 'no'}
|
|||||||
" ---------
|
" ---------
|
||||||
let g:vc_log_name = '~/vc.log'
|
let g:vc_log_name = '~/vc.log'
|
||||||
|
|
||||||
" ----
|
|
||||||
" gitv
|
|
||||||
" ----
|
|
||||||
let g:Gitv_OpenHorizontal = 1
|
|
||||||
|
|
||||||
" ------
|
" ------
|
||||||
" flake8
|
" flake8
|
||||||
" ------
|
" ------
|
||||||
@ -266,40 +296,11 @@ command PyIsort Isort
|
|||||||
" ----------
|
" ----------
|
||||||
let g:ConqueGdb_GdbExe = '/opt/OSELAS.Toolchain-2012.12.1/arm-cortexa8-linux-gnueabi/gcc-4.7.3-glibc-2.16.0-binutils-2.22-kernel-3.6-sanitized/bin/arm-cortexa8-linux-gnueabi-gdb'
|
let g:ConqueGdb_GdbExe = '/opt/OSELAS.Toolchain-2012.12.1/arm-cortexa8-linux-gnueabi/gcc-4.7.3-glibc-2.16.0-binutils-2.22-kernel-3.6-sanitized/bin/arm-cortexa8-linux-gnueabi-gdb'
|
||||||
|
|
||||||
" ------------------
|
" -------------
|
||||||
" packages / plugins
|
" YouCompleteMe
|
||||||
" ------------------
|
" -------------
|
||||||
packadd! asyncrun
|
let g:ycm_clangd_binary_path = '/usr/bin/clangd'
|
||||||
packadd! conque
|
"let g:ycm_clangd_binary_path = '/opt/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04/bin/clangd'
|
||||||
"packadd! diffchar
|
|
||||||
packadd! dirdiff
|
|
||||||
packadd! DoxygenToolkit
|
|
||||||
packadd! flake8
|
|
||||||
packadd! fugitive
|
|
||||||
"packadd! gdb-from-vim
|
|
||||||
packadd! gitv
|
|
||||||
packadd! gundo
|
|
||||||
packadd! isort
|
|
||||||
packadd! linediff
|
|
||||||
packadd! merginal
|
|
||||||
"packadd! pyclewn
|
|
||||||
"packadd! pylint
|
|
||||||
packadd! python-pep8-indent
|
|
||||||
packadd! qml
|
|
||||||
packadd! rtags
|
|
||||||
packadd! sessionman
|
|
||||||
packadd! SrchRplcHiGrp
|
|
||||||
packadd! syntastic
|
|
||||||
packadd! tagbar
|
|
||||||
"packadd! tail
|
|
||||||
packadd! tcomment
|
|
||||||
packadd! termdebug
|
|
||||||
packadd! vc
|
|
||||||
packadd! vimagit
|
|
||||||
packadd! VisIncr
|
|
||||||
packadd! xml
|
|
||||||
packadd! yapf
|
|
||||||
packadd! YouCompleteMe
|
|
||||||
|
|
||||||
if exists('g:debug')
|
if exists('g:debug')
|
||||||
if (g:debug > 0)
|
if (g:debug > 0)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user