From: Junio C Hamano Date: Fri, 27 Jun 2014 18:23:03 +0000 (-0700) Subject: Merge git://ozlabs.org/~paulus/gitk X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7fe683480124239ec0ab555c9b529e4c54707d7b;p=git.git 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 --- 7fe683480124239ec0ab555c9b529e4c54707d7b