From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Jun 2007 22:41:06 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk into pm/gitk
X-Git-Tag: v1.5.3-rc0~58
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e1341abc3759950e891822088cb0163b71b316b3;p=git.git

Merge branch 'master' of git://git./gitk/gitk into pm/gitk

* 'master' of git://git.kernel.org/pub/scm/gitk/gitk: (21 commits)
  gitk: Add a progress bar to show progress while resetting
  gitk: Improve handling of whitespace and special chars in filenames
  gitk: Fix bug causing nearby tags/heads to sometimes not be displayed
  gitk: Limit how often we change the canvas scrolling region
  gitk: Add a "reset branch to here" row context-menu operation
  gitk: Get rid of the childlist variable
  gitk: Speed up the reading of references
  gitk: Show local uncommitted changes as a fake commit
  gitk: New algorithm for drawing the graph lines
  gitk: Store ids in rowrangelist and idrowranges rather than row numbers
  gitk: Disable the head context menu entries for the checked-out branch
  gitk: Cope with commit messages with carriage-returns and initial blank lines
  gitk: Implement a simple scheduler for the compute-intensive stuff
  gitk: Improve the behaviour of the initial selection
  gitk: Add some more comments to the optimize_rows procedure
  gitk: Don't try to list large numbers of tags or heads in the details pane
  gitk: New infrastructure for working out branches & previous/next tags
  [PATCH] gitk: Allow specifying tabstop as other than default 8 characters.
  [PATCH] gitk: Update fontsize in patch / tree list
  [PATCH] gitk: Make selection highlight color configurable
  ...

Conflicts:

	gitk
---

e1341abc3759950e891822088cb0163b71b316b3