From: Junio C Hamano <junkio@cox.net>
Date: Wed, 7 Jun 2006 06:24:27 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.4.0-rc2~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7fb23e6083dbefa8eb4c554d8b2cd5a6292b2df4;p=git.git

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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Re-read the descendent/ancestor tag & head info on update
  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
---

7fb23e6083dbefa8eb4c554d8b2cd5a6292b2df4