[PULL] gitk: synchronize repository trees

Pull-request

https://github.com/j6t/gitk.git master

Message

Johannes Sixt Nov. 24, 2024, 5:39 p.m. UTC

The following changes since commit 7dd272eca153058da2e8d5b9960bbbf0b4f0cbaa:

  gitk: escape file paths before piping to git log (2023-05-08 09:15:24 -0700)

are available in the Git repository at:

  https://github.com/j6t/gitk.git master

for you to fetch changes up to c18400c6bb04f4e8875c1930db72ddd9b94649ca:

  Makefile(s): avoid recipe prefix in conditional statements (2024-11-24 13:45:49 +0100)

As stated in an earlier message[*], I am taking over maintainership of
Gitk. This first pull request of mine synchronizes my tree with that of
version 2.47.0 in the git.git repository:

$ git rev-parse v2.47.0:gitk-git
192acffcdd37921fc1c46c0373806651876d772c

There is no functional change because I only continued on top of the
commits that are already in git.git and cherry-picked the changes listed
below (which were tree-wide changes that covered gitk-git) into my
history.

I have prepared the change that brought us here in branch
tp/macos-visiblity-fix, but it is not yet included, because I want to
give it some workout on Windows before I move it forward.

[*] https://lore.kernel.org/git/[e-mail]/

----------------------------------------------------------------
Josh Soref (2):
      doc: update links to current pages
      doc: switch links to https

Taylor Blau (1):
      Makefile(s): avoid recipe prefix in conditional statements

 Makefile | 4 ++--
 gitk     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Junio C Hamano Nov. 25, 2024, 3:22 a.m. UTC | #1

Johannes Sixt <[e-mail]> writes:

> As stated in an earlier message[*], I am taking over maintainership of
> Gitk. This first pull request of mine synchronizes my tree with that of
> version 2.47.0 in the git.git repository:
>
> $ git rev-parse v2.47.0:gitk-git
> 192acffcdd37921fc1c46c0373806651876d772c
>
> There is no functional change because I only continued on top of the
> commits that are already in git.git and cherry-picked the changes listed
> below (which were tree-wide changes that covered gitk-git) into my
> history.
>
> I have prepared the change that brought us here in branch
> tp/macos-visiblity-fix, but it is not yet included, because I want to
> give it some workout on Windows before I move it forward.

Thanks.  Will pull to synchronise the 'maint' and then merge it
upwards.

>
> [*] https://lore.kernel.org/git/[e-mail]/
>
> ----------------------------------------------------------------
> Josh Soref (2):
>       doc: update links to current pages
>       doc: switch links to https
>
> Taylor Blau (1):
>       Makefile(s): avoid recipe prefix in conditional statements
>
>  Makefile | 4 ++--
>  gitk     | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)