Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 1 Jun 2006 06:26:45 +0000 (23:26 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 1 Jun 2006 06:26:45 +0000 (23:26 -0700)
commit423a15c849487fda5dc5cdfc15658062cfdd11b0
tree83699d5d69e36375e7caf2f4af8fceab4bd4ba82
parent5f625247ee64276a5ea51359c685be7ddefcfc59
parent0825de892f1796e6ca6ac81e0af10f6c136a9f1d
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