Git Snippets

Mon, 01 Mar 2010 00:00:00 +0100

Show commits from another branch not contained in current branch

git cherry -v otherbranch
+ f7d6a569bb6912aac97fce9ac92c4302863fb0d9 thecommit

Find deleted files

git log --diff-filter=D --summary

Create empty commit

sometimes necessary for build/deploy pipelines …

git commit --allow-empty -m "Empty-Commit"

Cherry pick without commit

git cherry-pick -n HASH

Using vimdiff for diff

set it via git config

git config --global diff.tool vimdiff
git config --global merge.tool vimdiff

set it via ~/.gitconfig

[diff]
    tool = vimdiff
[merge]
    tool = vimdiff

Vim Snippets

Mon, 01 Mar 2010 00:00:00 +0100

Format JSON with jq

:%!jq .

Vim Plugin Manager

Installation

Download it from its GitHub repository or the risky but easy way using curl:

curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim

Adding Plugins

Add a plugin section to the .vimrc:

.vimrc

call plug#begin()
" The default plugin directory will be as follows:
"   - Vim (Linux/macOS): '~/.vim/plugged'
"   - Vim (Windows): '~/vimfiles/plugged'
"   - Neovim (Linux/macOS/Windows): stdpath('data') . '/plugged'
" You can specify a custom plugin directory by passing it as the argument
"   - e.g. `call plug#begin('~/.vim/plugged')`
"   - Avoid using standard Vim directory names like 'plugin'

" Make sure you use single quotes

" Gruvbox Theme
Plug 'sainnhe/gruvbox-material'

" Initialize plugin system
" - Automatically executes `filetype plugin indent on` and `syntax enable`.
call plug#end()
" You can revert the settings after the call like so:
"   filetype indent off   " Disable file-type-specific indentation
"   syntax off            " Disable syntax highlighting

Vim on Micha Kops' Tech Notes