From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 Aug 2009 10:46:51 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.6.5-rc0~69
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1d7d6ad539fabd49421d8ef7b27c0f287430bc7d;p=git.git

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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Parse arbitrary commit-ish in SHA1 field
  gitk: Fix direction of symmetric difference in optimized mode
  gitk: New option to hide remote refs
  gitk: Do not hard-code "encoding" in attribute lookup functions
---

1d7d6ad539fabd49421d8ef7b27c0f287430bc7d
diff --cc gitk-git/gitk
index 4604c831f,8c08310e6..8c08310e6
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk