From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 28 Oct 2007 07:43:40 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.5.4-rc0~318
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=071a8877662974f588dfc0b1ac7df2764b7e0337;p=git.git

Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

* 'master' of git://git.kernel.org/pub/scm/gitk/gitk: (34 commits)
  gitk: Use the UI font for the diff/old version/new version radio buttons
  gitk: Simplify the code for finding commits
  gitk: Fix a couple more bugs in the path limiting
  gitk: Fix some bugs with path limiting in the diff display
  gitk: Use the status window for other functions
  gitk: Integrate the reset progress bar in the main frame
  gitk: Ensure tabstop setting gets restored by Cancel button
  gitk: Limit diff display to listed paths by default
  gitk: Fix Tcl error: can't unset findcurline
  gitk: Get rid of the diffopts variable
  gitk: Fix bug where the last few commits would sometimes not be visible
  gitk: Add a font chooser
  gitk: Keep track of font attributes ourselves instead of using font actual
  gitk: Use named fonts instead of the font specification
  gitk: Fix bug causing Tcl error when changing find match type
  gitk: Fix the tab setting in the diff display window
  gitk: Add progress bars for reading in stuff and for finding
  gitk: Fix a couple of bugs
  gitk: Simplify highlighting interface and combine with Find function
  gitk: Fix bug in generating patches
  ...
---

071a8877662974f588dfc0b1ac7df2764b7e0337