kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge https://github.com/prati0100/git-gui 

* https://github.com/prati0100/git-gui:
  git-gui: Handle Ctrl + BS/Del in the commit msg
  Subject: git-gui: fix syntax error because of missing semicolon
maint
Junio C Hamano 2020-05-21 11:15:04 -07:00
parent 87680d32ef c195247812
commit ae92ac8ae3
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-gui/git-gui.sh
View File

@ -2600,12 +2600,12 @@ proc toggle_or_diff {mode w args} {
update_indexinfo \ update_indexinfo \
"Unstaging [short_path $path] from commit" \ "Unstaging [short_path $path] from commit" \
[list $path] \ [list $path] \
[concat $after [list ui_ready]] [concat $after {ui_ready;}]
} elseif {$w eq $ui_workdir} { } elseif {$w eq $ui_workdir} {
update_index \ update_index \
"Adding [short_path $path]" \ "Adding [short_path $path]" \
[list $path] \ [list $path] \
[concat $after [list ui_ready]] [concat $after {ui_ready;}]
} }
} else { } else {
set selected_paths($path) 1 set selected_paths($path) 1
@ -3928,6 +3928,8 @@ bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
bind $ui_comm <$M1B-Key-equal> {show_more_context;break} bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
bind $ui_comm <$M1B-Key-plus> {show_more_context;break} bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break} bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
bind $ui_comm <$M1B-Key-BackSpace> {event generate %W <Meta-Delete>;break}
bind $ui_comm <$M1B-Key-Delete> {event generate %W <Meta-d>;break}


bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break} bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break} bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}

6
git-gui/lib/index.tcl
View File

@ -60,7 +60,7 @@ proc rescan_on_error {err {after {}}} {


$::main_status stop_all $::main_status stop_all
unlock_index unlock_index
rescan [concat $after [list ui_ready]] 0 rescan [concat $after {ui_ready;}] 0
} }


proc update_indexinfo {msg path_list after} { proc update_indexinfo {msg path_list after} {
@ -314,7 +314,7 @@ proc unstage_helper {txt paths} {
update_indexinfo \ update_indexinfo \
$txt \ $txt \
$path_list \ $path_list \
[concat $after [list ui_ready]] [concat $after {ui_ready;}]
} }
} }


@ -366,7 +366,7 @@ proc add_helper {txt paths} {
update_index \ update_index \
$txt \ $txt \
$path_list \ $path_list \
[concat $after {ui_status [mc "Ready to commit."]}] [concat $after {ui_status [mc "Ready to commit."];}]
} }
} }



2
git-gui/lib/mergetool.tcl
View File

@ -59,7 +59,7 @@ proc merge_add_resolution {path} {
update_index \ update_index \
[mc "Adding resolution for %s" [short_path $path]] \ [mc "Adding resolution for %s" [short_path $path]] \
[list $path] \ [list $path] \
[concat $after [list ui_ready]] [concat $after {ui_ready;}]
} }


proc merge_force_stage {stage} { proc merge_force_stage {stage} {