summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2023-11-05 11:12:43 +1100
committerMaxime Coste <mawww@kakoune.org>2023-11-05 11:12:43 +1100
commit1da8952e1fa3004dcd8b47792f1af45dafa3a23e (patch)
tree133861586226f4ec85685fdc176d34e4550cbed6
parentcf6e18e3c19b62b63c919200252e718e0b141fc1 (diff)
parent83b7bbdc55059134af4b0e3e5c0fe68d3930fee8 (diff)
Merge remote-tracking branch 'lobre/git-edit'
-rw-r--r--rc/tools/git.kak9
1 files changed, 7 insertions, 2 deletions
diff --git a/rc/tools/git.kak b/rc/tools/git.kak
index b0b457f1..2a5f31ce 100644
--- a/rc/tools/git.kak
+++ b/rc/tools/git.kak
@@ -82,13 +82,13 @@ define-command -params 1.. \
grep
} -shell-script-candidates %{
if [ $kak_token_to_complete -eq 0 ]; then
- printf "add\napply\nrm\nreset\nblame\ncommit\ncheckout\ndiff\nhide-blame\nhide-diff\nlog\nnext-hunk\nprev-hunk\nshow\nshow-branch\nshow-diff\ninit\nstatus\nupdate-diff\ngrep\n"
+ printf "add\napply\nrm\nreset\nblame\ncommit\ncheckout\ndiff\nhide-blame\nhide-diff\nlog\nnext-hunk\nprev-hunk\nshow\nshow-branch\nshow-diff\ninit\nstatus\nupdate-diff\ngrep\nedit\n"
else
case "$1" in
commit) printf -- "--amend\n--no-edit\n--all\n--reset-author\n--fixup\n--squash\n"; git ls-files -m ;;
add) git ls-files -dmo --exclude-standard ;;
apply) printf -- "--reverse\n--cached\n--index\n" ;;
- rm|grep) git ls-files -c ;;
+ grep|edit) git ls-files -c --recurse-submodules ;;
esac
fi
} \
@@ -382,6 +382,11 @@ define-command -params 1.. \
set-option current grepcmd '$kak_opt_grepcmd'
}"
;;
+ edit)
+ shift
+ enquoted="$(printf '"%s" ' "$@")"
+ printf %s "edit -existing -- $enquoted"
+ ;;
*)
printf "fail unknown git command '%s'\n" "$1"
exit