From 0b0561c4c9727677c399b2c6ca094ad7823aaca9 Mon Sep 17 00:00:00 2001 From: Kevin Zhuang Date: Tue, 28 Jul 2020 09:53:48 +1000 Subject: [PATCH] fix: fix some wrong wording in fzf header --- scripts/fcheckout | 4 ++-- scripts/fedit | 6 +++--- scripts/freset | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/fcheckout b/scripts/fcheckout index 4584b33..1d572d5 100755 --- a/scripts/fcheckout +++ b/scripts/fcheckout @@ -92,7 +92,7 @@ elif [[ "${action_type}" == "modified" ]]; then # checkout modified file back to version in HEAD while IFS= read -r line; do selected_files+=("${line}") - done < <(get_modified_file 'select a file to checkout version in HEAD') + done < <(get_modified_file 'select files to checkout version in HEAD') [[ "${#selected_files[@]}" -eq 0 ]] && exit 1 [[ -z "${confirm}" ]] && echo "(dryrun) dotbare checkout --" "${selected_files[@]}" [[ -z "${confirm}" ]] && confirm=$(get_confirmation "Confirm?") @@ -102,7 +102,7 @@ elif [[ "${action_type}" == "select" ]]; then # checkout selected files to a selected commit while IFS= read -r line; do selected_files+=("${line}") - done < <(get_git_file 'select a file to checkout') + done < <(get_git_file 'select files to checkout to previous commit') [[ "${#selected_files[@]}" -eq 0 ]] && exit 1 # continue select a commit and then checkout the file back to the selected commit selected_commit=$(get_commit 'select the target commit' "${selected_files[@]}") diff --git a/scripts/fedit b/scripts/fedit index acca636..0db34f4 100755 --- a/scripts/fedit +++ b/scripts/fedit @@ -60,7 +60,7 @@ while [[ "$#" -gt 0 ]]; do done if [[ "${edit_type}" == "commit" ]]; then - selected_commit=$(get_commit "select a commit to rename") + selected_commit=$(get_commit "select a commit to edit") [[ -z "${selected_commit}" ]] && exit 1 git --git-dir="${DOTBARE_DIR}" --work-tree="${DOTBARE_TREE}" rebase -i "${selected_commit}"~ else @@ -68,9 +68,9 @@ else selected_files+=("${line}") done < <( if [[ "${edit_type}" == "modified" ]]; then - get_modified_file "select modified files to edit" + get_modified_file "select files to edit" else - get_git_file "select tracked files to edit" + get_git_file "select files to edit" fi ) [[ "${#selected_files[@]}" -eq 0 ]] && exit 1 diff --git a/scripts/freset b/scripts/freset index 1bc5cb6..8c12e53 100755 --- a/scripts/freset +++ b/scripts/freset @@ -79,7 +79,7 @@ while [[ "$#" -gt 0 ]]; do done if [[ "${reset_type}" == "commit" ]]; then - selected_commit=$(get_commit "select the target commit for HEAD") + selected_commit=$(get_commit "select the target commit") [[ -z "${selected_commit}" ]] && exit 1 [[ -z "${confirm}" ]] && confirm=$(get_confirmation "Reset HEAD to ${selected_commit} ${reset_option}?") [[ "${confirm}" != 'y' ]] && exit 1