threads / discuss / 54451

[GIT PULL] git-gui changes for v2.29

Subject: [GIT PULL] git-gui changes for v2.29

## tl;dr

5 messages between Oct 17, 2020 and Oct 21, 2020.

replies: 4people: 3as markdown or json

Pratyush Yadav· Oct 17, 2020, 16:34 UTC · lore
Junio,
Please pull in the changes in git-gui for v2.29. 
Dscho,

I still have some open points about intent-to-add files that I'm not clear about. Let's target support for them in the next release.

Regards, Pratyush Yadav

--- The following changes since commit 469725c1a3d44f7e1475f1d37cd13e0824d4ea41:

  Merge branch 'mt/open-worktree' (2020-06-22 20:23:28 +0530)
are available in the Git repository at:
  https://github.com/prati0100/git-gui.git 
for you to fetch changes up to 38c2ac2e2ab00a8bcef528f24cb5b883b4413e5c:
  Merge branch 'sh/blame-tooltip' (2020-10-17 15:05:27 +0530)
----------------------------------------------------------------
Pratyush Yadav (3):
      Merge branch 'st/spaces-tabs-cleanup' into master
      Merge branch 'st/dark-mode' into master
      Merge branch 'sh/blame-tooltip'
Serg Tereshchenko (2):
      git-gui: fix mixed tabs and spaces; prefer tabs
      git-gui: improve dark mode support
Stefan Haller (1):
      git-gui: blame: prevent tool tips from sticking around after Command-Tab
 git-gui.sh     | 103 ++++++++++++++++++++++++++++++---------------------------
 lib/blame.tcl  |   1 +
 lib/themed.tcl |  38 +++++++++++++++++++++
 3 files changed, 93 insertions(+), 49 deletions(-)
Junio C Hamano· Oct 17, 2020, 20:11 UTC · re: Pratyush Yadav · lore

Re: [GIT PULL] git-gui changes for v2.29

Pratyush Yadav <me@yadavpratyush.com> writes:
> Junio,
>
> Please pull in the changes in git-gui for v2.29. 
OK, thanks.  Pulled but not pushed out (yet).

By the way, next time we might want to arrange subsystem pulls a bit sooner than immediately before the final---what do you think?

Show 30 quoted lines
> The following changes since commit 
> 469725c1a3d44f7e1475f1d37cd13e0824d4ea41:
>
>   Merge branch 'mt/open-worktree' (2020-06-22 20:23:28 +0530)
>
> are available in the Git repository at:
>
>   https://github.com/prati0100/git-gui.git 
>
> for you to fetch changes up to 38c2ac2e2ab00a8bcef528f24cb5b883b4413e5c:
>
>   Merge branch 'sh/blame-tooltip' (2020-10-17 15:05:27 +0530)
>
> ----------------------------------------------------------------
> Pratyush Yadav (3):
>       Merge branch 'st/spaces-tabs-cleanup' into master
>       Merge branch 'st/dark-mode' into master
>       Merge branch 'sh/blame-tooltip'
>
> Serg Tereshchenko (2):
>       git-gui: fix mixed tabs and spaces; prefer tabs
>       git-gui: improve dark mode support
>
> Stefan Haller (1):
>       git-gui: blame: prevent tool tips from sticking around after Command-Tab
>
>  git-gui.sh     | 103 ++++++++++++++++++++++++++++++---------------------------
>  lib/blame.tcl  |   1 +
>  lib/themed.tcl |  38 +++++++++++++++++++++
>  3 files changed, 93 insertions(+), 49 deletions(-)
Pratyush Yadav· Oct 19, 2020, 08:19 UTC · re: Junio C Hamano · lore

Re: [GIT PULL] git-gui changes for v2.29

On 17/10/20 01:11PM, Junio C Hamano wrote:
Show 10 quoted lines
> Pratyush Yadav <me@yadavpratyush.com> writes:
> 
> > Junio,
> >
> > Please pull in the changes in git-gui for v2.29. 
> 
> OK, thanks.  Pulled but not pushed out (yet).
> 
> By the way, next time we might want to arrange subsystem pulls a bit
> sooner than immediately before the final---what do you think?
Ok. I'll send the PR by -rc0 or -rc1 next time.
Show 30 quoted lines
> > The following changes since commit 
> > 469725c1a3d44f7e1475f1d37cd13e0824d4ea41:
> >
> >   Merge branch 'mt/open-worktree' (2020-06-22 20:23:28 +0530)
> >
> > are available in the Git repository at:
> >
> >   https://github.com/prati0100/git-gui.git 
> >
> > for you to fetch changes up to 38c2ac2e2ab00a8bcef528f24cb5b883b4413e5c:
> >
> >   Merge branch 'sh/blame-tooltip' (2020-10-17 15:05:27 +0530)
> >
> > ----------------------------------------------------------------
> > Pratyush Yadav (3):
> >       Merge branch 'st/spaces-tabs-cleanup' into master
> >       Merge branch 'st/dark-mode' into master
> >       Merge branch 'sh/blame-tooltip'
> >
> > Serg Tereshchenko (2):
> >       git-gui: fix mixed tabs and spaces; prefer tabs
> >       git-gui: improve dark mode support
> >
> > Stefan Haller (1):
> >       git-gui: blame: prevent tool tips from sticking around after Command-Tab
> >
> >  git-gui.sh     | 103 ++++++++++++++++++++++++++++++---------------------------
> >  lib/blame.tcl  |   1 +
> >  lib/themed.tcl |  38 +++++++++++++++++++++
> >  3 files changed, 93 insertions(+), 49 deletions(-)
-- 
Regards,
Pratyush Yadav
Junio C Hamano· Oct 19, 2020, 17:24 UTC · re: Pratyush Yadav · lore

Re: [GIT PULL] git-gui changes for v2.29

Pratyush Yadav <me@yadavpratyush.com> writes:
Show 13 quoted lines
> On 17/10/20 01:11PM, Junio C Hamano wrote:
>> Pratyush Yadav <me@yadavpratyush.com> writes:
>> 
>> > Junio,
>> >
>> > Please pull in the changes in git-gui for v2.29. 
>> 
>> OK, thanks.  Pulled but not pushed out (yet).
>> 
>> By the way, next time we might want to arrange subsystem pulls a bit
>> sooner than immediately before the final---what do you think?
>
> Ok. I'll send the PR by -rc0 or -rc1 next time.

Sure, of you can even tell me to pull and cook in 'next' during the early to mid part of a cycle if you wanted to give a particular change wider exposure. The point is that it does not have to happen immediately before the release.

Johannes Schindelin· Oct 21, 2020, 13:42 UTC · re: Pratyush Yadav · lore

Re: [GIT PULL] git-gui changes for v2.29

Hi Pratyush,
On Sat, 17 Oct 2020, Pratyush Yadav wrote:
> Dscho,
>
> I still have some open points about intent-to-add files that I'm not
> clear about. Let's target support for them in the next release.
That's fine. I merged my version into Git for Windows v2.29.0.

Ciao, Dscho

← back to recent threads