From 6637ad03e2b78e9fe88ad39b4fcc8c0142c5de9e Mon Sep 17 00:00:00 2001 From: Tobias Manske Date: Fri, 22 May 2020 13:10:59 +0200 Subject: [PATCH] General maintenance; NEW: git fzf --- .gitconfig | 3 ++- ssh.pub | 1 - vim/.vimrc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitconfig b/.gitconfig index 3b9e908..e36cfbe 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,9 +1,10 @@ [user] email = tobias.manske@mailbox.org name = Tobias Manske - signingkey = 978D99F12D4E041F + signingkey = FF57750B830AA3A1 [alias] lg = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all + fzf = "!git lg --color=always | fzf --multi --preview 'git show --color=always {+2}' --ansi" cu = "!git branch --merged | grep -v '\\*' | grep -v master | xargs -n 1 git branch -d" undo = reset HEAD~ ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ; } ; gi" diff --git a/ssh.pub b/ssh.pub index 4d3bc68..a798126 100644 --- a/ssh.pub +++ b/ssh.pub @@ -1,4 +1,3 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKnXpQ4aaW3Uhn2pfZ79+mqC1Hls2gvSARFNDroNjxGH rad4day@Cyb3r ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOEbfr3p9Kl3ob6wlzIw0JemcPMtMJs2jQeoFL4lJu/p rad4day@ThinkPad ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDhMf4bDL4YdzGGJfEnCJRxKU5diRHeSrAmxT+Or6QY4 u0_a112Motorola ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOGFGekwSXCl0+QZXRoc51KF0TamoJrQBUgs6k4Py+Nb rad4day@x380yoga diff --git a/vim/.vimrc b/vim/.vimrc index 8cb4ca1..775fb75 100755 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -1,5 +1,3 @@ -" Plugin Manager -source ~/.vim/config/plugins.vim " Make sure plug.vim is present if empty(glob('~/.vim/autoload/plug.vim')) @@ -9,6 +7,8 @@ if empty(glob('~/.vim/autoload/plug.vim')) autocmd VimEnter * PlugInstall --sync endif +" Plugin Manager +source ~/.vim/config/plugins.vim " Prepare central backup/swap/undo directory let &undodir = expand('~/.vim/.undo//')