utils-code/wfxr.forgit
1
0
Fork 0
mirror of https://github.com/wfxr/forgit.git synced 2026-09-14 17:26:15 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add cherry-pick support (#106)

Browse source 
* Add cherry-pick support

* Fix shellcheck warnings
This commit is contained in:
Jia Sui 2020-08-27 11:02:43 +08:00 committed by GitHub
parent e0573975ef
commit 3166756079
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -74,6 +74,8 @@ source (curl -sSL git.io/forgit.fish | psub)
- **Interactive `git clean` selector** (`gclean`)
- **Interactive `git cherry-pick` selector** (`gcp`)
### ⌨ Keybinds
| Key | Action |
@ -108,6 +110,7 @@ forgit_ignore=gi
forgit_restore=gcf
forgit_clean=gclean
forgit_stash_show=gss
forgit_cherry_pick=gcp
```
Forgit will use the default configured pager from git (`core.pager`,

21
forgit.plugin.zsh
View file

@ -201,6 +201,26 @@ forgit::ignore::clean() {
[[ -d "$FORGIT_GI_REPO_LOCAL" ]] && rm -rf "$FORGIT_GI_REPO_LOCAL"
}
forgit::cherry::pick() {
local base target preview opts
base=$(git branch --show-current)
[[ -z $1 ]] && echo "Please specify target branch name" && return 1
target="$1"
preview="echo {} | xargs -I% git show --color=always % | $forgit_show_pager"
opts="
$FORGIT_FZF_DEFAULT_OPTS
-m -0
"
git cherry "$base" "$target" | cut -d ' ' -f2 |
FZF_DEFAULT_OPTS="$opts" fzf --preview="$preview" |
xargs -I% git cherry-pick %
}
FORGIT_FZF_DEFAULT_OPTS="
$FZF_DEFAULT_OPTS
--ansi
@ -227,4 +247,5 @@ if [[ -z "$FORGIT_NO_ALIASES" ]]; then
alias "${forgit_restore:-gcf}"='forgit::restore'
alias "${forgit_clean:-gclean}"='forgit::clean'
alias "${forgit_stash_show:-gss}"='forgit::stash::show'
alias "${forgit_cherry_pick:-gcp}"='forgit::cherry::pick'
fi