From: Pratyush Yadav <me@yadavpratyush.com>
Date: Sat, 14 Sep 2019 17:53:12 +0000 (+0530)
Subject: Merge branch 'bp/amend-toggle-bind'
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/f7a8834ba4aa20ec750833cf8d30d9a9fed5eade?hp=ec7424e1a634ba4a509227f003bd9cf31f12b4c2

Merge branch 'bp/amend-toggle-bind'

Toggle amend on and off with the keyboard shortcut "Ctrl+e".

* bp/amend-toggle-bind:
git-gui: add hotkey to toggle "Amend Last Commit"
---

diff --git a/git-gui.sh b/git-gui.sh
index c345b5c6be..c75b3e90bc 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -3376,10 +3376,16 @@ ttext $ui_comm -background white -foreground black \
 	-relief sunken \
 	-width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
 	-font font_diff \
+	-xscrollcommand {.vpane.lower.commarea.buffer.frame.sbx set} \
 	-yscrollcommand {.vpane.lower.commarea.buffer.frame.sby set}
+${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sbx \
+	-orient horizontal \
+	-command [list $ui_comm xview]
 ${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sby \
+	-orient vertical \
 	-command [list $ui_comm yview]
 
+pack .vpane.lower.commarea.buffer.frame.sbx -side bottom -fill x
 pack .vpane.lower.commarea.buffer.frame.sby -side right -fill y
 pack $ui_comm -side left -fill y
 pack .vpane.lower.commarea.buffer.header -side top -fill x