Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Sep 2012 03:45:55 +0000 (20:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Sep 2012 03:45:55 +0000 (20:45 -0700)
* da/gitk-reload-tag-contents:
  gitk: Rename 'tagcontents' to 'cached_tagcontent'
  gitk: Teach "Reread references" to reload tags
  gitk: Avoid Meta1-F5

1  2 
gitk-git/gitk

diff --cc gitk-git/gitk
Simple merge