]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge git://ozlabs.org/~paulus/gitk
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Jun 2014 18:23:03 +0000 (11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Jun 2014 18:23:03 +0000 (11:23 -0700)
* 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

1  2 
gitk-git/gitk

diff --cc gitk-git/gitk
Simple merge