summaryrefslogtreecommitdiff
path: root/git-gui/lib/checkout_op.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-09-18 18:22:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-09-18 18:22:11 (GMT)
commit7e1976e2100da661e858e3aa12ae2c8d152431c2 (patch)
treee038bcff3e55a4fb8c858025592299931e454f22 /git-gui/lib/checkout_op.tcl
parent8a3a6817e24ae1cf1fd08fb90b4a99e6817f646d (diff)
parentf7a8834ba4aa20ec750833cf8d30d9a9fed5eade (diff)
downloadgit-7e1976e2100da661e858e3aa12ae2c8d152431c2.zip
git-7e1976e2100da661e858e3aa12ae2c8d152431c2.tar.gz
git-7e1976e2100da661e858e3aa12ae2c8d152431c2.tar.bz2
Merge branch 'master' of https://github.com/prati0100/git-gui
* 'master' of https://github.com/prati0100/git-gui: git-gui: add hotkey to toggle "Amend Last Commit" git-gui: add horizontal scrollbar to commit buffer git-gui: convert new/amend commit radiobutton to checkbutton git-gui: add hotkeys to set widget focus git-gui: allow undoing last revert git-gui: return early when patch fails to apply git-gui: allow reverting selected hunk git-gui: allow reverting selected lines
Diffstat (limited to 'git-gui/lib/checkout_op.tcl')
-rw-r--r--git-gui/lib/checkout_op.tcl6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-gui/lib/checkout_op.tcl b/git-gui/lib/checkout_op.tcl
index 9e7412c..a522829 100644
--- a/git-gui/lib/checkout_op.tcl
+++ b/git-gui/lib/checkout_op.tcl
@@ -389,7 +389,7 @@ $err
}
method _after_readtree {} {
- global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
+ global commit_type HEAD MERGE_HEAD PARENT
global current_branch is_detached
global ui_comm
@@ -490,12 +490,12 @@ method _update_repo_state {} {
# amend mode our file lists are accurate and we can avoid
# the rescan.
#
- global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
+ global commit_type_is_amend commit_type HEAD MERGE_HEAD PARENT
global ui_comm
unlock_index
set name [_name $this]
- set selected_commit_type new
+ set commit_type_is_amend 0
if {[string match amend* $commit_type]} {
$ui_comm delete 0.0 end
$ui_comm edit reset