diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-27 18:23:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-27 18:23:03 (GMT) |
| commit | 7fe683480124239ec0ab555c9b529e4c54707d7b (patch) | |
| tree | 2ab9f2b5f8ffc2fc099911c769e2d57cfb9f884e /t/t6023-merge-file.sh | |
| parent | ea0e524ebd60f87546a9998e447d307d3f51a3e3 (diff) | |
| parent | bde4a0f9f3035d482a80c32b4a485333b9ed4875 (diff) | |
| download | git-7fe683480124239ec0ab555c9b529e4c54707d7b.zip git-7fe683480124239ec0ab555c9b529e4c54707d7b.tar.gz git-7fe683480124239ec0ab555c9b529e4c54707d7b.tar.bz2 | |
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
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions