From: Junio C Hamano <junkio@cox.net>
Date: Thu, 1 Jun 2006 06:26:45 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~45
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=423a15c849487fda5dc5cdfc15658062cfdd11b0;p=git.git

Merge branch 'master' into next

* master:
  gitk: show_error fix
  [PATCH] gitk: start-up bugfix
  [PATCH] gitk: Replace "git-" commands with "git "
  [PATCH] gitk: Display commit messages with word wrap
  gitk: Fix bug where page-up/down wouldn't always work properly
  gitk: Fix display of "(...)" for parents/children we haven't drawn
---

423a15c849487fda5dc5cdfc15658062cfdd11b0