tree a238e8d10a6e86ea404761b65713a09002fadb1c
parent 306ee63a703ad67c54ba1209dc11dd9ea500dc1f
parent 6cd80496e9d3694825ec941663b65c9516102289
author Junio C Hamano <gitster@pobox.com> 1601744787 -0700
committer Junio C Hamano <gitster@pobox.com> 1601744787 -0700

Merge remote-tracking branch 'paulus/master' into pm/gitk-update

* paulus/master:
  gitk: Resize panes correctly when reducing window size
  gitk: replace tabs with spaces
  gitk: fix the context menu not appearing in the presence of submodule diffs
  gitk: Un-hide selection in areas with non-default background color
  gitk: add diff lines background colors
  gitk: be prepared to be run in a bare repository
  gitk: Preserve window dimensions on exit when not using ttk themes
  gitk: don't highlight files after submodules as submodules
  gitk: fix branch name encoding error
  gitk: rename "commit summary" to "commit reference"