From 8fd4ae0da9201cfa5b3331139420e159cea25c6f Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Fri, 6 May 2022 12:02:56 +0530 Subject: [PATCH] fish: Drop all fzf + git related functions vim-fugitive is all that is needed. We wrote these functions before getting well versed with fugitive. These are not required anymore. --- fish/.config/fish/functions/fcR.fish | 3 --- fish/.config/fish/functions/fcf.fish | 3 --- fish/.config/fish/functions/fco.fish | 3 --- fish/.config/fish/functions/fcoc.fish | 3 --- fish/.config/fish/functions/fcr.fish | 3 --- fish/.config/fish/functions/ffa.fish | 3 --- fish/.config/fish/functions/ffco.fish | 3 --- fish/.config/fish/functions/ffr.fish | 3 --- fish/.config/fish/functions/ffrs.fish | 3 --- fish/.config/fish/functions/frbi.fish | 3 --- 10 files changed, 30 deletions(-) delete mode 100644 fish/.config/fish/functions/fcR.fish delete mode 100644 fish/.config/fish/functions/fcf.fish delete mode 100644 fish/.config/fish/functions/fco.fish delete mode 100644 fish/.config/fish/functions/fcoc.fish delete mode 100644 fish/.config/fish/functions/fcr.fish delete mode 100644 fish/.config/fish/functions/ffa.fish delete mode 100644 fish/.config/fish/functions/ffco.fish delete mode 100644 fish/.config/fish/functions/ffr.fish delete mode 100644 fish/.config/fish/functions/ffrs.fish delete mode 100644 fish/.config/fish/functions/frbi.fish diff --git a/fish/.config/fish/functions/fcR.fish b/fish/.config/fish/functions/fcR.fish deleted file mode 100644 index ff24af8..0000000 --- a/fish/.config/fish/functions/fcR.fish +++ /dev/null @@ -1,3 +0,0 @@ -function fcR --description 'Git revert a selected commit using fzf' - git revert (git log --pretty=oneline --abbrev-commit --color=always | fzf --ansi +s | awk '{print $1}') -end diff --git a/fish/.config/fish/functions/fcf.fish b/fish/.config/fish/functions/fcf.fish deleted file mode 100644 index bd4e319..0000000 --- a/fish/.config/fish/functions/fcf.fish +++ /dev/null @@ -1,3 +0,0 @@ -function fcf --description 'Git commit fixup using fzf' - git commit --fixup (git log --pretty=oneline --abbrev-commit --color=always | fzf --ansi | cut -d ' ' -f1) -end diff --git a/fish/.config/fish/functions/fco.fish b/fish/.config/fish/functions/fco.fish deleted file mode 100644 index 6886de4..0000000 --- a/fish/.config/fish/functions/fco.fish +++ /dev/null @@ -1,3 +0,0 @@ -function fco --description 'Checkout a branch using fzf' - git branch --all | grep -v HEAD | string trim | fzf | read -l result; and git checkout "$result" -end diff --git a/fish/.config/fish/functions/fcoc.fish b/fish/.config/fish/functions/fcoc.fish deleted file mode 100644 index beb6ffd..0000000 --- a/fish/.config/fish/functions/fcoc.fish +++ /dev/null @@ -1,3 +0,0 @@ -function fcoc --description 'Checkout a commit using fzf' - git log --pretty=oneline --abbrev-commit --reverse | fzf --tac +s -e | awk '{print $1;}' | read -l result; and git checkout "$result" -end diff --git a/fish/.config/fish/functions/fcr.fish b/fish/.config/fish/functions/fcr.fish deleted file mode 100644 index 3f33498..0000000 --- a/fish/.config/fish/functions/fcr.fish +++ /dev/null @@ -1,3 +0,0 @@ -function fcr --description 'Git reset to a selected commit using fzf' - git reset $argv (git log --pretty=oneline --abbrev-commit --color=always | fzf --ansi +s | awk '{print $1}') -end diff --git a/fish/.config/fish/functions/ffa.fish b/fish/.config/fish/functions/ffa.fish deleted file mode 100644 index 1cdc219..0000000 --- a/fish/.config/fish/functions/ffa.fish +++ /dev/null @@ -1,3 +0,0 @@ -function ffa --description 'Git add files using fzf' - git add -- (git ls-files --modified --others --exclude-standard | fzf -m --preview 'bat --color=always {}') -end diff --git a/fish/.config/fish/functions/ffco.fish b/fish/.config/fish/functions/ffco.fish deleted file mode 100644 index 9529044..0000000 --- a/fish/.config/fish/functions/ffco.fish +++ /dev/null @@ -1,3 +0,0 @@ -function ffco --description 'Git checkout a file using fzf' - git checkout $argv -- (git ls-files --modified --exclude-standard | fzf -m) -end diff --git a/fish/.config/fish/functions/ffr.fish b/fish/.config/fish/functions/ffr.fish deleted file mode 100644 index 770b98c..0000000 --- a/fish/.config/fish/functions/ffr.fish +++ /dev/null @@ -1,3 +0,0 @@ -function ffr --description 'Git restore a file using fzf' - git restore $argv -- (git ls-files --modified --exclude-standard | fzf -m) -end diff --git a/fish/.config/fish/functions/ffrs.fish b/fish/.config/fish/functions/ffrs.fish deleted file mode 100644 index 4fbc8f8..0000000 --- a/fish/.config/fish/functions/ffrs.fish +++ /dev/null @@ -1,3 +0,0 @@ -function ffrs --description 'Git restore a staged file using fzf' - git restore --staged $argv -- (git diff --name-only --staged | fzf -m) -end diff --git a/fish/.config/fish/functions/frbi.fish b/fish/.config/fish/functions/frbi.fish deleted file mode 100644 index 7cc4afc..0000000 --- a/fish/.config/fish/functions/frbi.fish +++ /dev/null @@ -1,3 +0,0 @@ -function frbi --description 'Git interactive rebase using fzf' - git rebase -i (git log --pretty=oneline --abbrev-commit --color=always | fzf --ansi | cut -d ' ' -f1) -end