Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <junkio@cox.net>
Wed, 3 May 2006 03:07:14 +0000 (20:07 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 3 May 2006 03:07:14 +0000 (20:07 -0700)
* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Allow view to specify arbitrary arguments to git-rev-list
gitk: Fix file list display when files are renamed
gitk: Basic support for highlighting one view within another
gitk: Add a tree-browsing mode
gitk: Use a text widget for the file list
gitk: add menu item for editing the current view
gitk: Implement "permanent" views (stored in ~/.gitk)
gitk: Use git-rev-parse only to identify file/dir names on cmd line
gitk: Remember the view in the history list
gitk: Don't reread git-rev-list output from scratch on view switch
gitk: Fix various bugs in the view support
gitk: Make File->Update work properly again
gitk: Implement multiple views
[PATCH] gitk: Add a visual tag for remote refs

Trivial merge