| commit | ebcaadabcb90eaf35a3bd69a50cccce4be4dcc2c | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Sat, 5 May 2007 06:28:41 +0000 (5 02:28 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Tue, 8 May 2007 03:35:53 +0000 (7 23:35 -0400) | ||
| tree | fe7451c1179ff6edaee950c2cf178a532b946f61 | treesnapshot (tar.gz zip) |
| parent | 1fc4ba86f80c1365943abac54679dd1924a6737b | commitdiff |
git-gui: Use vi-like keys in merge dialog
Since we support vi-like keys for scrolling in other UI contexts
we can easily do so here too. Tk's handy little `event generate'
makes this a lot easier than I thought it would be. We may want
to go back and fix some of the other vi-like bindings to redirect
to the arrow and pageup/pagedown keys, rather than running the
view changes directly.
I've bound 'v' to visualize, as this is a somewhat common thing
to want to do in the merge dialog. Control (or Command) Return
is also bound to start the merge, much as it is bound in the
main window to activate the commit.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Since we support vi-like keys for scrolling in other UI contexts
we can easily do so here too. Tk's handy little `event generate'
makes this a lot easier than I thought it would be. We may want
to go back and fix some of the other vi-like bindings to redirect
to the arrow and pageup/pagedown keys, rather than running the
view changes directly.
I've bound 'v' to visualize, as this is a somewhat common thing
to want to do in the merge dialog. Control (or Command) Return
is also bound to start the merge, much as it is bound in the
main window to activate the commit.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| lib/merge.tcl | diffblobblamehistory |