From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 17 Dec 2011 06:18:42 +0000 (-0800)
Subject: Merge git://ozlabs.org/~paulus/gitk
X-Git-Tag: v1.7.9-rc0~62
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=09bb4eb4f14c0b92baa649b2b97cda2390b84b84;p=git.git

Merge git://ozlabs.org/~paulus/gitk

* git://ozlabs.org/~paulus/gitk:
  gitk: Make vi-style keybindings more vi-like
  gitk: Make "touching paths" search support backslashes
  gitk: Show modified files with separate work tree
  gitk: Simplify calculation of gitdir
  gitk: Run 'git rev-parse --git-dir' only once
  gitk: Put temporary directory inside .git
  gitk: Fix "External diff" with separate work tree
  gitk: Fix "blame parent commit" with separate work tree
  gitk: Fix "show origin of this line" with separate work tree
  gitk: Fix file highlight when run in subdirectory
  gitk: Update copyright
  gitk: When a commit contains a note, mark it with a yellow box
  gitk: Remember time zones from author and commit timestamps
  gitk: Remove unused $cdate array
---

09bb4eb4f14c0b92baa649b2b97cda2390b84b84