Merge git://ozlabs.org/~paulus/gitk
commit7fe683480124239ec0ab555c9b529e4c54707d7b
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Jun 2014 18:23:03 +0000 (27 11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Jun 2014 18:23:03 +0000 (27 11:23 -0700)
tree2ab9f2b5f8ffc2fc099911c769e2d57cfb9f884e
parentea0e524ebd60f87546a9998e447d307d3f51a3e3
parentbde4a0f9f3035d482a80c32b4a485333b9ed4875
Merge git://ozlabs.org/~paulus/gitk

* git://ozlabs.org/~paulus/gitk:
  gitk: Add visiblerefs option, which lists always-shown branches
  gitk: Catch mkdtemp errors
  gitk: Use mktemp -d to avoid predictable temporary directories
  gitk: Honor TMPDIR when viewing external diffs
gitk-git/gitk