diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-18 20:22:11 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-18 20:22:11 +0200 |
| commit | 7e1976e2100da661e858e3aa12ae2c8d152431c2 (patch) | |
| tree | e038bcff3e55a4fb8c858025592299931e454f22 /git-gui/lib/commit.tcl | |
| parent | Merge gitk to pick up emergency build fix (diff) | |
| parent | Merge branch 'bp/amend-toggle-bind' (diff) | |
| download | git-7e1976e2100da661e858e3aa12ae2c8d152431c2.tar.xz git-7e1976e2100da661e858e3aa12ae2c8d152431c2.zip | |
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/commit.tcl')
| -rw-r--r-- | git-gui/lib/commit.tcl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl index 75ea965dac..b516aa2990 100644 --- a/git-gui/lib/commit.tcl +++ b/git-gui/lib/commit.tcl @@ -333,7 +333,7 @@ proc commit_writetree {curHEAD msg_p} { proc commit_committree {fd_wt curHEAD msg_p} { global HEAD PARENT MERGE_HEAD commit_type commit_author global current_branch - global ui_comm selected_commit_type + global ui_comm commit_type_is_amend global file_states selected_paths rescan_active global repo_config global env @@ -467,8 +467,8 @@ A rescan will be automatically started now. # -- Update in memory status # - set selected_commit_type new set commit_type normal + set commit_type_is_amend 0 set HEAD $cmt_id set PARENT $cmt_id set MERGE_HEAD [list] |