From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 3 Oct 2020 17:06:27 +0000 (-0700)
Subject: Merge remote-tracking branch 'paulus/master' into pm/gitk-update
X-Git-Tag: v2.29.0-rc0~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2b9cb1c5a45290f568681862fb27714d6e4e52b;p=thirdparty%2Fgit.git

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"
---

e2b9cb1c5a45290f568681862fb27714d6e4e52b