From b5e452942e964dfcaf520242d580e5e9f2b0b7d2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 5 Jun 2018 07:56:41 +0530 Subject: [PATCH] Port changes from master --- docs/changelog.rst | 4 ++-- kitty/config_data.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 91e20d62e..a6d689b93 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -22,8 +22,8 @@ Changelog - icat kitten: Add :option:`kitty +kitten icat --print-window-size` to easily detect the window size in pixels from scripting languages (:iss:`581`) -- hints kitten: Allow selecting hashes from the terminal useful for git - commits. (:pull:`604`) +- hints kitten: Allow selecting hashes from the terminal with + :sc:`insert_selected_hash` useful for git commits. (:pull:`604`) - Allow specifying initial window size in number of cells in addition to pixels (:iss:`436`) diff --git a/kitty/config_data.py b/kitty/config_data.py index 5a75271e2..d55308207 100644 --- a/kitty/config_data.py +++ b/kitty/config_data.py @@ -775,6 +775,10 @@ output of things like: ls -1''')) k('insert_selected_word', 'kitty_mod+p>w', 'kitten hints --type word --program -', _('Insert selected word'), long_text=_(''' Select words and insert into terminal.''')) +k('insert_selected_hash', 'kitty_mod+p>h', 'kitten hints --type hash --program -', _('Insert selected hash'), long_text=_(''' +Select something that looks like a hash and insert it into the terminal. +Useful with git, which uses sha1 hashes to identify commits''')) + # }}} g('shortcuts.misc') # {{{