From: Junio C Hamano <junkio@cox.net>
Date: Sun, 4 Jun 2006 07:02:03 +0000 (-0700)
Subject: Merge branch 'new' of git://git.kernel.org/pub/scm/gitk/gitk into next
X-Git-Tag: v1.4.1-rc1~39
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0e84fb06a1022f99c96cfcd728e7bf029ef0b5e3;p=git.git

Merge branch 'new' of git://git./gitk/gitk into next

* 'new' of git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Show branch name(s) as well, if "show nearby tags" is enabled
  gitk: Show nearby tags
  gitk: Add a goto next/previous highlighted commit function
  gitk: Provide ability to highlight based on relationship to selected commit
  gitk: Fix bug in highlight stuff when no line is selected
  gitk: Move "pickaxe" find function to highlight facility
  gitk: Improve the text window search function
  gitk: First cut at a search function in the patch/file display window
  gitk: Highlight paths of interest in tree view as well
  gitk: Highlight entries in the file list as well
  gitk: Make a row of controls for controlling highlighting
---

0e84fb06a1022f99c96cfcd728e7bf029ef0b5e3