Merge git://ozlabs.org/~paulus/gitk
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 May 2013 14:51:41 +0000 (07:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 May 2013 14:51:41 +0000 (07:51 -0700)
* git://ozlabs.org/~paulus/gitk:
  gitk: On OSX, bring the gitk window to front
  gitk: Add support for -G'regex' pickaxe variant
  gitk: Add menu item for reverting commits
  gitk: Simplify file filtering
  gitk: Display the date of a tag in a human-friendly way
  gitk: Improve behaviour of drop-down lists
  gitk: Move hard-coded colors to .gitk

1  2 
gitk-git/gitk

diff --cc gitk-git/gitk
Simple merge