Merge git://git2.kernel.org/pub/scm/gitk/gitk

* git://git2.kernel.org/pub/scm/gitk/gitk:
[PATCH] gitk: bind <F5> key to Update (reread commits)

diff --git a/gitk b/gitk
index 9ddff3e7f7b011564c56fb619f57bed66d875f7e..1cd2a8f5287f97547386f91f2f226cd7dacd0f30 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -720,6 +720,7 @@ proc makewindow {} {
     bindkey <Key-Return> {findnext 0}
     bindkey ? findprev
     bindkey f nextfile
+    bindkey <F5> updatecommits
     bind . <Control-q> doquit
     bind . <Control-f> dofind
     bind . <Control-g> {findnext 0}
@@ -985,6 +986,7 @@ f           Scroll diff view to next file
 <Ctrl-plus>    Increase font size
 <Ctrl-KP->     Decrease font size
 <Ctrl-minus>   Decrease font size
+<F5>           Update
 } \
            -justify left -bg white -border 2 -relief sunken
     pack $w.m -side top -fill both