From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 Dec 2008 23:25:48 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.6.1-rc2~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=521ae135b7dcae27fb78e1b941f50158558108e6;p=thirdparty%2Fgit.git

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
---

521ae135b7dcae27fb78e1b941f50158558108e6
diff --cc gitk-git/gitk
index f7f177621c,64a873d2ef..64a873d2ef
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk