![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Aug 2007 18:36:04 +0000 (11:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Aug 2007 18:36:04 +0000 (11:36 -0700) | ||
| commit | f16eb1f6a3f9a1a09a61f0cd07e9c9ff9ee54530 | |
| tree | 251049e9a78198c5996aa152d29794e47f9b511d | tree | snapshot |
| parent | 7e5dcea8311472156ed0fea164e689777353f931 | commit | diff |
| parent | e8b5f4be708a73fd8b6c06a782168d5b04e3e5c1 | commit | diff |
Merge branch 'master' of git://git./gitk/gitk
* 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
[PATCH] gitk: Make the date/time display configurable
[PATCH] gitk: Let user easily specify lines of context in diff view
gitk: Fix warning when removing a branch
* 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
[PATCH] gitk: Make the date/time display configurable
[PATCH] gitk: Let user easily specify lines of context in diff view
gitk: Fix warning when removing a branch