From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Apr 2011 16:33:06 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.7.5-rc2~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2dbae5acc7b3d0615bcf534ac85181a3185cb6de;p=git.git

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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Update cherry-pick error message parsing
  gitk: Quote tag names in event bindings to avoid problems with % chars
  gitk: Allow user to control how much of the SHA1 ID gets auto-selected
  gitk: spelling fixes in Russian translation
  gitk: Take only numeric version components when computing $git_version
---

2dbae5acc7b3d0615bcf534ac85181a3185cb6de