utils-code/wfxr.forgit
1
0
Fork 0
mirror of https://github.com/wfxr/forgit.git synced 2026-09-10 07:16:23 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

stash working

Browse source
This commit is contained in:
Christopher Apple 2019-11-02 21:08:34 -06:00
parent 35cbef1d59
commit e0dadacdfe
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
forgit.plugin.fish
View file

@ -26,7 +26,7 @@ function forgit::log
set opts "
$FORGIT_FZF_DEFAULT_OPTS
+s +m --tiebreak=index --preview=\"$cmd\"
--bind=\"enter:execute($cmd |LESS='-R' less)\"
--bind=\"enter:execute($cmd |env LESS='-R' less)\"
--bind=\"ctrl-y:execute-silent(echo {} |grep -Eo '[a-f0-9]+' | head -1 | tr -d '\n' | pbcopy)\"
$FORGIT_LOG_FZF_OPTS
"
@ -119,22 +119,23 @@ function forgit::restore
echo 'Nothing to restore.'
end
## git stash viewer
#forgit::stash::show() {
# forgit::inside_work_tree || return 1
# set cmd "git stash show \$(echo {}| cut -d: -f1) --color=always --ext-diff $forgit_fancy"
# set opts"
# $FORGIT_FZF_DEFAULT_OPTS
# +s +m -0 --tiebreak=index --preview=\"$cmd\" --bind=\"enter:execute($cmd |LESS='-R' less)\"
# $FORGIT_STASH_FZF_OPTS
# "
# git stash list | env FZF_DEFAULT_OPTS="$opts" fzf
#}
# git stash viewer
function forgit::stash::show
forgit::inside_work_tree || return 1
set cmd "git stash show \$(echo {}| cut -d: -f1) --color=always --ext-diff $forgit_fancy"
set opts "
$FORGIT_FZF_DEFAULT_OPTS
+s +m -0 --tiebreak=index --preview=\"$cmd\" --bind=\"enter:execute($cmd |env LESS='-R' less)\"
$FORGIT_STASH_FZF_OPTS
"
git stash list | env FZF_DEFAULT_OPTS="$opts" fzf
end
#
## git clean selector
#forgit::clean() {
# forgit::inside_work_tree || return 1
# set opts"
# set opts "
# $FORGIT_FZF_DEFAULT_OPTS
# -m -0
# $FORGIT_CLEAN_FZF_OPTS
@ -155,7 +156,7 @@ end
# # https://github.com/sharkdp/bat.git
# hash bat > /dev/null 2>&1 && cat='bat -l gitignore --color=always' || cat="cat"
# set cmd "$cat $FORGIT_GI_TEMPLATES/{2}{,.gitignore} 2>/dev/null"
# set opts"
# set opts "
# $FORGIT_FZF_DEFAULT_OPTS
# -m --preview=\"$cmd\" --preview-window='right:70%'
# $FORGIT_IGNORE_FZF_OPTS

2
forgit.plugin.zsh
View file

@ -4,6 +4,8 @@ forgit::warn() { printf "%b[Warn]%b %s\n" '\e[0;33m' '\e[0m' "$@" >&2; }
forgit::info() { printf "%b[Info]%b %s\n" '\e[0;32m' '\e[0m' "$@" >&2; }
forgit::inside_work_tree() { git rev-parse --is-inside-work-tree >/dev/null; }
dumb dumb dumb test
# https://github.com/so-fancy/diff-so-fancy
hash diff-so-fancy &>/dev/null && forgit_fancy='|diff-so-fancy'
# https://github.com/wfxr/emoji-cli