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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Add a menu option to start git gui
  gitk: Make line origin search update the busy status
  gitk: Update German translation
  gitk: Fix bug in accessing undefined "notflag" variable
  gitk: Highlight only when search type is "containing:".
  gitk: Fix context menu items for generating diffs when in tree mode

diff --cc gitk-git/gitk
index f7f177621ceecd749c8ec581f023607f1297f0be,64a873d2efae0496c0485a6051c4fdd21e190634..64a873d2efae0496c0485a6051c4fdd21e190634
mode 100644,100755..100644
--- 1/gitk-git/gitk
--- 2/gitk
+++ b/gitk-git/gitk

diff --cc gitk-git/po/de.po
Simple merge