From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Feb 2008 19:03:49 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.5.5-rc0~223
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6bc4c72132adbdc06c428f86a96f27e4f8173b99;p=git.git

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

* git://git.kernel.org/pub/scm/gitk/gitk:
  [PATCH] gitk: learn --show-all output
  [PATCH] gitk: properly deal with tag names containing / (slash)
  [PATCH] gitk: Add checkbutton to ignore space changes
  [PATCH] gitk: Fix "Key bindings" message
---

6bc4c72132adbdc06c428f86a96f27e4f8173b99
diff --cc gitk-git/gitk
index 5560e4dc5,25ab725bb..25ab725bb
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk