Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • chris/dotfiles
1 result
Select Git revision
Show changes
Commits on Source (3)
......@@ -19,6 +19,7 @@
[alias]
ahead = show --name-status @{u}..HEAD
alias = config --get-regexp ^alias\\.
behind = show --name-status HEAD..@{u}
changed = show --name-status
colors = log -1 HEAD --color --pretty=format:'Plain %C(magenta)magenta%Creset %C(red)red%Creset %C(yellow)yellow%Creset %C(green)green%Creset %C(cyan)cyan%Creset %C(blue)blue%Creset %C(black)black%Creset %C(white)white%Creset %C(normal)normal%Creset %nBOLD %C(bold magenta)magenta%Creset %C(bold red)red%Creset %C(bold yellow)yellow%Creset %C(bold green)green%Creset %C(bold cyan)cyan%Creset %C(bold blue)blue%Creset %C(bold black)black%Creset %C(bold white)white%Creset %C(bold normal)normal%Creset %nDIM %C(dim magenta)magenta%Creset %C(dim red)red%Creset %C(dim yellow)yellow%Creset %C(dim green)green%Creset %C(dim cyan)cyan%Creset %C(dim blue)blue%Creset %C(dim black)black%Creset %C(dim white)white%Creset %C(dim normal)normal%Creset %nUL %C(ul magenta)magenta%Creset %C(ul red)red%Creset %C(ul yellow)yellow%Creset %C(ul green)green%Creset %C(ul cyan)cyan%Creset %C(ul blue)blue%Creset %C(ul black)black%Creset %C(ul white)white%Creset %C(ul normal)normal%Creset %nBLINK %C(blink magenta)magenta%Creset %C(blink red)red%Creset %C(blink yellow)yellow%Creset %C(blink green)green%Creset %C(blink cyan)cyan%Creset %C(blink blue)blue%Creset %C(blink black)black%Creset %C(blink white)white%Creset %C(blink normal)normal%Creset %nREVERSE %C(reverse magenta)magenta%Creset %C(reverse red)red%Creset %C(reverse yellow)yellow%Creset %C(reverse green)green%Creset %C(reverse cyan)cyan%Creset %C(reverse blue)blue%Creset %C(reverse black)black%Creset %C(reverse white)white%Creset %C(reverse normal)normal%Creset %n'
last = show --name-status HEAD
......
......@@ -56,15 +56,19 @@ colorscheme solarized
cmap w!! w !sudo tee > /dev/null %
" Clear the search highlighting. Call with `<leader>/`
nnoremap <silent> <leader>/ :set nohlsearch<CR>
" Show invisible characters. Toggle with <F10>
set nolist
set listchars=tab:\|·,trail:·,nbsp:¤,extends:>,precedes:<,eol:¬
nnoremap <F10> :set list!<CR>
nnoremap <silent> <F10> :set list!<CR>
" Put a vertical ruler in columns 81 and 121. Toggle with <F9>
highlight ColorColumn ctermbg=magenta
nnoremap <F9> :call ToggleColorColumn()<CR>
nnoremap <silent> <F9> :call ToggleColorColumn()<CR>
function! ToggleColorColumn()
if &colorcolumn
setlocal colorcolumn&
......