From 2c440f28381995d49affd5277374dfde5acac098 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Thu, 10 Oct 2013 14:18:38 -0700 Subject: [PATCH] xbase: make "Ctrl+Enter" apply changes and rebase Make the rebase editor consistent with the commit message editor by supporting the "Ctrl+Enter" shortcut to accept and apply changes. Signed-off-by: David Aguilar --- share/git-cola/bin/git-xbase | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/git-cola/bin/git-xbase b/share/git-cola/bin/git-xbase index abcf42a8..1db0de92 100755 --- a/share/git-cola/bin/git-xbase +++ b/share/git-cola/bin/git-xbase @@ -168,6 +168,9 @@ class Editor(QtGui.QWidget): layout.addLayout(controls_layout) self.setLayout(layout) + self.action_rebase = qtutils.add_action(self, + N_('Rebase'), self.rebase, 'Ctrl+Return') + notifier.add_observer(COMMITS_SELECTED, self.commits_selected) qtutils.connect_button(self.rebase_button, self.rebase) @@ -580,6 +583,7 @@ K = shift row up 5, s = squash spacebar = toggle enabled +ctrl+enter = accept changes and rebase ctrl+q = cancel and abort the rebase ctrl+d = launch external diff """) -- 2.11.4.GIT