diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl index fabfd97..8244b81 100644 --- a/dot_gitconfig.tmpl +++ b/dot_gitconfig.tmpl @@ -48,6 +48,9 @@ ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative lstat = log --name-status + # initial push + puu = push -u origin + # Short summary of commiters summary = shortlog --summary --numbered --email @@ -135,3 +138,8 @@ [init] # Talisman Test # templatedir = 'c:/cygwin64/home/sgaiselm/.git-template' +[filter "lfs"] + process = git-lfs filter-process + required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f diff --git a/dot_vimrc b/dot_vimrc index e9e8e87..0741bd7 100644 --- a/dot_vimrc +++ b/dot_vimrc @@ -28,6 +28,10 @@ let &t_SI.="\e[5 q" let &t_EI.="\e[1 q" let &t_te.="\e[0 q" +" See https://github.com/airblade/vim-gitgutter +" let g:gitgutter_git_executable = 'C:\cygwin64\bin\git.exe' +let g:gitgutter_git_executable = '/usr/bin/git' + " Inspiried by http://nvie.com/posts/how-i-boosted-my-vim/ " Editing behaviour {{{ set showmode " always show what mode we're currently editing in @@ -111,6 +115,7 @@ set cursorline " underline the current line, for quick orientat " colorscheme mustang " colorscheme solarized +colorscheme solarized8 " https://superuser.com/questions/249779/how-to-setup-a-line-length-marker-in-vim-gvim " https://vi.stackexchange.com/questions/356/how-can-i-set-up-a-ruler-at-a-specific-column @@ -231,8 +236,15 @@ function! LightLineFilesize() return size . ' bytes' endfunction -function! AndMore() +"function! AndMore() " return "TODO: more cool stuff!" " return winwidth(0) > 70 ? (&fileformat . ' ' . WebDevIconsGetFileFormatSymbol()) : '' - return WebDevIconsGetFileTypeSymbol() "winwidth(0) > 70 ? (&fileformat . ' x ' . WebDevIconsGetFileTypeSymbol()) : 'no ft' -endfunction +"" return WebDevIconsGetFileTypeSymbol() "winwidth(0) > 70 ? (&fileformat . ' x ' . WebDevIconsGetFileTypeSymbol()) : 'no ft' +"endfunction + +" Load all plugins now. +" Plugins need to be added to runtimepath before helptags can be generated. +packloadall +" Load all of the helptags now, after plugins have been loaded. +" All messages and errors will be ignored. +silent! helptags ALL