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

diff --cc gitk-git/gitk
index 4604c831fe0c5ac9b855cdef6f71888e99dd9462,8c08310e6dea4aa904b47cd335686deedb6fd5ed..8c08310e6dea4aa904b47cd335686deedb6fd5ed
mode 100644,100755..100644
--- 1/gitk-git/gitk
--- 2/gitk
+++ b/gitk-git/gitk