summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2018-09-18 22:30:50 +1000
committerMaxime Coste <mawww@kakoune.org>2018-09-18 22:30:50 +1000
commit7956e893be014aaa3ebe54f6531ceb61fc202b07 (patch)
tree78c6beab523e4d3691948b36b3a9626a16fdfcc3
parent0fca6ae3dd0b702ef8a1aa624e50a500e424b170 (diff)
parent2c753889ca0308e1d366b6c0278e8f534a2d8b8b (diff)
Merge remote-tracking branch 'laelath/git-hide-diff'
-rw-r--r--rc/extra/git-tools.kak7
1 files changed, 5 insertions, 2 deletions
diff --git a/rc/extra/git-tools.kak b/rc/extra/git-tools.kak
index bd773b46..82d62f78 100644
--- a/rc/extra/git-tools.kak
+++ b/rc/extra/git-tools.kak
@@ -26,10 +26,10 @@ set-face global GitDiffFlags default,black
define-command -params 1.. \
-docstring %sh{printf 'git [<arguments>]: git wrapping helper
All the optional arguments are forwarded to the git utility
-Available commands:\n add\n rm\n blame\n commit\n checkout\n diff\n hide-blame\n log\n show\n show-diff\n status\n update-diff'} \
+Available commands:\n add\n rm\n blame\n commit\n checkout\n diff\n hide-blame\n hide-diff\n log\n show\n show-diff\n status\n update-diff'} \
-shell-candidates %{
if [ $kak_token_to_complete -eq 0 ]; then
- printf "add\nrm\nblame\ncommit\ncheckout\ndiff\nhide-blame\nlog\nshow\nshow-diff\nstatus\nupdate-diff\n"
+ printf "add\nrm\nblame\ncommit\ncheckout\ndiff\nhide-blame\nhide-diff\nlog\nshow\nshow-diff\nstatus\nupdate-diff\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 ;;
@@ -185,6 +185,9 @@ Available commands:\n add\n rm\n blame\n commit\n checkout\n diff\n hide-
echo 'try %{ add-highlighter window/git-diff flag-lines GitDiffFlags git_diff_flags }'
update_diff
;;
+ hide-diff)
+ echo 'try %{ remove-highlighter window/git-diff }'
+ ;;
update-diff) update_diff ;;
commit) shift; commit "$@" ;;
checkout)