From 02776a3d21048b0fabad9141f2793256ea2f9fcd Mon Sep 17 00:00:00 2001 From: Prathmesh Prabhu Date: Tue, 27 Jan 2026 04:43:03 +0000 Subject: [PATCH] Change recommended vim keybinding for "reset file" --- CHANGELOG.md | 3 +++ vim_style_key_config.ron | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4aba19c7e0..9338e6bdfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Changed +* change recommended `vim`-style key-binding for "reset file changes" to avoid conflict with "undo last commit" [[@callpraths](https://github.com/callpraths)] [[2853](https://github.com/gitui-org/gitui/pull/2853)] + ## [0.28.0] - 2025-12-14 **discard changes on checkout** diff --git a/vim_style_key_config.ron b/vim_style_key_config.ron index 5f3b30c3aa..5d582c9c4b 100644 --- a/vim_style_key_config.ron +++ b/vim_style_key_config.ron @@ -14,7 +14,7 @@ move_right: Some(( code: Char('l'), modifiers: "")), move_up: Some(( code: Char('k'), modifiers: "")), move_down: Some(( code: Char('j'), modifiers: "")), - + popup_up: Some(( code: Char('p'), modifiers: "CONTROL")), popup_down: Some(( code: Char('n'), modifiers: "CONTROL")), page_up: Some(( code: Char('b'), modifiers: "CONTROL")), @@ -26,7 +26,7 @@ edit_file: Some(( code: Char('I'), modifiers: "SHIFT")), - status_reset_item: Some(( code: Char('U'), modifiers: "SHIFT")), + status_reset_item: Some(( code: Char('u'), modifiers: "")), diff_reset_lines: Some(( code: Char('u'), modifiers: "")), diff_stage_lines: Some(( code: Char('s'), modifiers: "")),