diff --git a/conf.d/forgit.plugin.fish b/conf.d/forgit.plugin.fish index 266a78e..ba167c8 100644 --- a/conf.d/forgit.plugin.fish +++ b/conf.d/forgit.plugin.fish @@ -344,8 +344,8 @@ function forgit::cherry::pick -d "git cherry-picking" --argument-names 'target' " echo $base echo $target - git cherry "$base" "$target" --abbrev -v | cut -d ' ' -f2- | - env FZF_DEFAULT_OPTS="$opts" fzf | cut -d' ' -f1 | + git cherry "$base" "$target" --abbrev -v | + env FZF_DEFAULT_OPTS="$opts" fzf | cut -d' ' -f2 | xargs -I% git cherry-pick % end diff --git a/forgit.plugin.zsh b/forgit.plugin.zsh index 1541895..3e6210c 100755 --- a/forgit.plugin.zsh +++ b/forgit.plugin.zsh @@ -159,8 +159,8 @@ forgit::cherry::pick() { -m -0 --tiebreak=index $FORGIT_CHERRY_PICK_FZF_OPTS " - git cherry "$base" "$target" --abbrev -v | cut -d ' ' -f2- | - FZF_DEFAULT_OPTS="$opts" fzf | cut -d' ' -f1 | + git cherry "$base" "$target" --abbrev -v | + FZF_DEFAULT_OPTS="$opts" fzf | cut -d' ' -f2 | xargs -I% git cherry-pick % }