diff options
| author |  Pratyush Yadav <me@yadavpratyush.com> | 2019-09-14 02:18:27 +0530 |
|---|---|---|
| committer | Pratyush Yadav <me@yadavpratyush.com> | 2019-09-14 02:18:27 +0530 |
| commit | acfa495519d7c12cfafe1c0e52fdac40f5e41032 (patch) | |
| tree | d5207a238fb0bbf650b08519afac0f3b0bb0bfee /lib/commit.tcl | |
| parent | Merge branch 'py/revert-hunks-lines' (diff) | |
| parent | git-gui: convert new/amend commit radiobutton to checkbutton (diff) | |
| download | tgif-acfa495519d7c12cfafe1c0e52fdac40f5e41032.tar.xz | |
Merge branch 'bw/amend-checkbutton'
Change the amend setting from two radio buttons ("New commit" and "Amend
commit") to a single checkbutton. The two radio buttons can never be
selected together because they are exactly the opposite of each other,
so it makes sense to change it to a single checkbutton.
* bw/amend-checkbutton:
git-gui: convert new/amend commit radiobutton to checkbutton
Diffstat (limited to 'lib/commit.tcl')
| -rw-r--r-- | lib/commit.tcl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/commit.tcl b/lib/commit.tcl index 83620b7cbc..384f18f226 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -327,7 +327,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 @@ -461,8 +461,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] |