master from https://github.com/j6t/gitk
Merge branch 'mr/sort-refs-by-type'
* mr/sort-refs-by-type:
gitk: filter invisible upstream refs from reference list
gitk: avoid duplicated upstream refs
Signed-off-by: Johannes Sixt <j6t@kdbg.org>