![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 1 Jun 2006 06:26:45 +0000 (23:26 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 1 Jun 2006 06:26:45 +0000 (23:26 -0700) | ||
| commit | 423a15c849487fda5dc5cdfc15658062cfdd11b0 | |
| tree | 83699d5d69e36375e7caf2f4af8fceab4bd4ba82 | tree | snapshot |
| parent | 5f625247ee64276a5ea51359c685be7ddefcfc59 | commit | diff |
| parent | 0825de892f1796e6ca6ac81e0af10f6c136a9f1d | commit | diff |
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
* 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