All of lore.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] git-gui pull request
@ 2020-05-21 13:12 Pratyush Yadav
  2020-05-21 18:08 ` Junio C Hamano
  0 siblings, 1 reply; 16+ messages in thread
From: Pratyush Yadav @ 2020-05-21 13:12 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Hi Junio,

Please pull the changes in git-gui for Git v2.27.0. Since there was some 
fallout on MacOS last time around, please merge it in -rc2 so the 
changes can get a bit more exposure, even though the changes this time 
around are fairly minimal.

Regards,
Pratyush Yadav

---
The following changes since commit 
a5728022e07c53e5ac91db0960870518e243b7c1:

  Merge branch 'py/remove-tcloo' (2020-03-19 21:29:19 +0530)

are available in the Git repository at:

  https://github.com/prati0100/git-gui.git 

for you to fetch changes up to c195247812f8cd38ba7e1c603112e6c1d8d8e71e:

  Merge branch 'il/ctrl-bs-del' (2020-05-21 18:25:32 +0530)

----------------------------------------------------------------
Ansgar Röber (1):
      Subject: git-gui: fix syntax error because of missing semicolon

Ismael Luceno (1):
      git-gui: Handle Ctrl + BS/Del in the commit msg

Pratyush Yadav (2):
      Merge branch 'ar/ui-ready-semicolon'
      Merge branch 'il/ctrl-bs-del'

 git-gui.sh        | 6 ++++--
 lib/index.tcl     | 6 +++---
 lib/mergetool.tcl | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL] git-gui pull request
  2020-05-21 13:12 [GIT PULL] git-gui pull request Pratyush Yadav
@ 2020-05-21 18:08 ` Junio C Hamano
  0 siblings, 0 replies; 16+ messages in thread
From: Junio C Hamano @ 2020-05-21 18:08 UTC (permalink / raw)
  To: Pratyush Yadav; +Cc: git

Pratyush Yadav <me@yadavpratyush.com> writes:

> Hi Junio,
>
> Please pull the changes in git-gui for Git v2.27.0. Since there was some 
> fallout on MacOS last time around, please merge it in -rc2 so the 
> changes can get a bit more exposure, even though the changes this time 
> around are fairly minimal.
>
> Regards,
> Pratyush Yadav

Thanks, will do.


> ---
> The following changes since commit 
> a5728022e07c53e5ac91db0960870518e243b7c1:
>
>   Merge branch 'py/remove-tcloo' (2020-03-19 21:29:19 +0530)
>
> are available in the Git repository at:
>
>   https://github.com/prati0100/git-gui.git 
>
> for you to fetch changes up to c195247812f8cd38ba7e1c603112e6c1d8d8e71e:
>
>   Merge branch 'il/ctrl-bs-del' (2020-05-21 18:25:32 +0530)
>
> ----------------------------------------------------------------
> Ansgar Röber (1):
>       Subject: git-gui: fix syntax error because of missing semicolon
>
> Ismael Luceno (1):
>       git-gui: Handle Ctrl + BS/Del in the commit msg
>
> Pratyush Yadav (2):
>       Merge branch 'ar/ui-ready-semicolon'
>       Merge branch 'il/ctrl-bs-del'
>
>  git-gui.sh        | 6 ++++--
>  lib/index.tcl     | 6 +++---
>  lib/mergetool.tcl | 2 +-
>  3 files changed, 8 insertions(+), 6 deletions(-)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL] git-gui pull request
  2021-02-26 16:10 Pratyush Yadav
@ 2021-02-27 20:47 ` Junio C Hamano
  0 siblings, 0 replies; 16+ messages in thread
From: Junio C Hamano @ 2021-02-27 20:47 UTC (permalink / raw)
  To: Pratyush Yadav; +Cc: git

Pratyush Yadav <me@yadavpratyush.com> writes:

> Hi Junio,
>
> Please pull the changes in git-gui for v2.31.
>
> ---
> The following changes since commit 
> 7b0cfe156e1f1fbb77ab35d55d48eef41625944d:
>
>   Merge branch 'sh/inactive-background' (2020-12-19 01:02:34 +0530)
>
> are available in the Git repository at:
>
>   https://github.com/prati0100/git-gui.git 
>
> for you to fetch changes up to b1056f60b63f1bc8226d01881bc829e171fc78bf:
>
>   Merge branch 'py/commit-comments' (2021-02-22 20:19:53 +0530)

Thanks, will do so when I come back to my main development
environment.

>
> ----------------------------------------------------------------
> Mikhail Klyushin (1):
>       git-gui: fix typo in russian locale
>
> Pratyush Yadav (3):
>       Merge branch 'mk/russian-translation'
>       git-gui: remove lines starting with the comment character
>       Merge branch 'py/commit-comments'
>
>  git-gui.sh     |  5 +++++
>  lib/commit.tcl | 18 ++++++++++++++++--
>  po/ru.po       |  2 +-
>  3 files changed, 22 insertions(+), 3 deletions(-)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [GIT PULL] git-gui pull request
@ 2021-02-26 16:10 Pratyush Yadav
  2021-02-27 20:47 ` Junio C Hamano
  0 siblings, 1 reply; 16+ messages in thread
From: Pratyush Yadav @ 2021-02-26 16:10 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Hi Junio,

Please pull the changes in git-gui for v2.31.

---
The following changes since commit 
7b0cfe156e1f1fbb77ab35d55d48eef41625944d:

  Merge branch 'sh/inactive-background' (2020-12-19 01:02:34 +0530)

are available in the Git repository at:

  https://github.com/prati0100/git-gui.git 

for you to fetch changes up to b1056f60b63f1bc8226d01881bc829e171fc78bf:

  Merge branch 'py/commit-comments' (2021-02-22 20:19:53 +0530)

----------------------------------------------------------------
Mikhail Klyushin (1):
      git-gui: fix typo in russian locale

Pratyush Yadav (3):
      Merge branch 'mk/russian-translation'
      git-gui: remove lines starting with the comment character
      Merge branch 'py/commit-comments'

 git-gui.sh     |  5 +++++
 lib/commit.tcl | 18 ++++++++++++++++--
 po/ru.po       |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)


-- 
Regards,
Pratyush Yadav

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL] git-gui pull request
  2020-12-18 19:51 Pratyush Yadav
@ 2020-12-19  5:24 ` Junio C Hamano
  0 siblings, 0 replies; 16+ messages in thread
From: Junio C Hamano @ 2020-12-19  5:24 UTC (permalink / raw)
  To: Pratyush Yadav; +Cc: git

Pratyush Yadav <me@yadavpratyush.com> writes:

> Hi Junio,
>
> Please pull in changes in git-gui for Git v2.30. I hope the PR is not 
> too late this time. Thanks.

Thanks.  Between -rc0 and -rc2 (like "today") would be a good time
to do this.

Pulled.

> ---
> The following changes since commit 38c2ac2e2ab00a8bcef528f24cb5b883b4413e5c:
>
>   Merge branch 'sh/blame-tooltip' (2020-10-17 15:05:27 +0530)
>
> are available in the Git repository at:
>
>   https://github.com/prati0100/git-gui.git
>
> for you to fetch changes up to 7b0cfe156e1f1fbb77ab35d55d48eef41625944d:
>
>   Merge branch 'sh/inactive-background' (2020-12-19 01:02:34 +0530)
>
> ----------------------------------------------------------------
> David Aguilar (1):
>       git-gui: ssh-askpass: add a checkbox to show the input text
>
> Dimitriy Ryazantcev (1):
>       git-gui: update Russian translation
>
> Martin Schön (1):
>       git-gui: use commit message template
>
> Pratyush Yadav (8):
>       git-gui: Only touch GITGUI_MSG when needed
>       Merge branch 'ms/commit-template'
>       Merge branch 'dr/russian-translation'
>       Merge branch 'da/askpass-mask-checkbox'
>       Merge branch 'sh/macos-labels'
>       Merge branch 'rj/clean-speedup'
>       Merge branch 'st/selected-text-colors'
>       Merge branch 'sh/inactive-background'
>
> Ramsay Jones (1):
>       Makefile: conditionally include GIT-VERSION-FILE
>
> Serg Tereshchenko (1):
>       git-gui: Fix selected text colors
>
> Stefan Haller (2):
>       git-gui: fix colored label backgrounds when using themed widgets
>       git-gui: use gray background for inactive text widgets
>
>  Makefile         |    2 +
>  git-gui--askpass |   15 +-
>  git-gui.sh       |   30 +-
>  lib/commit.tcl   |    1 +
>  lib/themed.tcl   |   41 +-
>  po/ru.po         | 3053 +++++++++++++++++++++++++++++-------------------------
>  6 files changed, 1728 insertions(+), 1414 deletions(-)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [GIT PULL] git-gui pull request
@ 2020-12-18 19:51 Pratyush Yadav
  2020-12-19  5:24 ` Junio C Hamano
  0 siblings, 1 reply; 16+ messages in thread
From: Pratyush Yadav @ 2020-12-18 19:51 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Hi Junio,

Please pull in changes in git-gui for Git v2.30. I hope the PR is not 
too late this time. Thanks.

---
The following changes since commit 38c2ac2e2ab00a8bcef528f24cb5b883b4413e5c:

  Merge branch 'sh/blame-tooltip' (2020-10-17 15:05:27 +0530)

are available in the Git repository at:

  https://github.com/prati0100/git-gui.git

for you to fetch changes up to 7b0cfe156e1f1fbb77ab35d55d48eef41625944d:

  Merge branch 'sh/inactive-background' (2020-12-19 01:02:34 +0530)

----------------------------------------------------------------
David Aguilar (1):
      git-gui: ssh-askpass: add a checkbox to show the input text

Dimitriy Ryazantcev (1):
      git-gui: update Russian translation

Martin Schön (1):
      git-gui: use commit message template

Pratyush Yadav (8):
      git-gui: Only touch GITGUI_MSG when needed
      Merge branch 'ms/commit-template'
      Merge branch 'dr/russian-translation'
      Merge branch 'da/askpass-mask-checkbox'
      Merge branch 'sh/macos-labels'
      Merge branch 'rj/clean-speedup'
      Merge branch 'st/selected-text-colors'
      Merge branch 'sh/inactive-background'

Ramsay Jones (1):
      Makefile: conditionally include GIT-VERSION-FILE

Serg Tereshchenko (1):
      git-gui: Fix selected text colors

Stefan Haller (2):
      git-gui: fix colored label backgrounds when using themed widgets
      git-gui: use gray background for inactive text widgets

 Makefile         |    2 +
 git-gui--askpass |   15 +-
 git-gui.sh       |   30 +-
 lib/commit.tcl   |    1 +
 lib/themed.tcl   |   41 +-
 po/ru.po         | 3053 +++++++++++++++++++++++++++++-------------------------
 6 files changed, 1728 insertions(+), 1414 deletions(-)

-- 
Regards,
Pratyush Yadav

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL] git-gui pull request
  2020-07-19  9:45 Pratyush Yadav
@ 2020-07-20 19:03 ` Junio C Hamano
  0 siblings, 0 replies; 16+ messages in thread
From: Junio C Hamano @ 2020-07-20 19:03 UTC (permalink / raw)
  To: Pratyush Yadav; +Cc: git

Pratyush Yadav <me@yadavpratyush.com> writes:

> Please pull the changes in git-gui for Git v2.28.0-rc2. The changes this
> time around the are fairly small (only one commit in fact).

Will do.

>  lib/choose_repository.tcl | 27 +++------------------------
>  1 file changed, 3 insertions(+), 24 deletions(-)

Adding a feature by deleting lines is the best style of development
;-)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [GIT PULL] git-gui pull request
@ 2020-07-19  9:45 Pratyush Yadav
  2020-07-20 19:03 ` Junio C Hamano
  0 siblings, 1 reply; 16+ messages in thread
From: Pratyush Yadav @ 2020-07-19  9:45 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Hi Junio,

Please pull the changes in git-gui for Git v2.28.0-rc2. The changes this
time around the are fairly small (only one commit in fact).

Regards,
Pratyush Yadav

---
The following changes since commit c195247812f8cd38ba7e1c603112e6c1d8d8e71e:

  Merge branch 'il/ctrl-bs-del' (2020-05-21 18:25:32 +0530)

are available in the Git repository at:

  https://github.com/prati0100/git-gui.git

for you to fetch changes up to 469725c1a3d44f7e1475f1d37cd13e0824d4ea41:

  Merge branch 'mt/open-worktree' (2020-06-22 20:23:28 +0530)

----------------------------------------------------------------
Mikhail Terekhov (1):
      git-gui: allow opening work trees from the startup dialog

Pratyush Yadav (1):
      Merge branch 'mt/open-worktree'

 lib/choose_repository.tcl | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [GIT PULL] git-gui pull request
@ 2020-03-19 16:15 Pratyush Yadav
  0 siblings, 0 replies; 16+ messages in thread
From: Pratyush Yadav @ 2020-03-19 16:15 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Hi Junio,

Please pull the changes in git-gui for the Git v2.26.0 release.

Regards,
Pratyush Yadav

---
The following changes since commit 0d2116c6441079a5a1091e4cf152fd9d5fa9811b:

  Merge branch 'zs/open-current-file' (2020-01-05 02:38:03 +0530)

are available in the Git repository at:

  https://github.com/prati0100/git-gui.git

for you to fetch changes up to a5728022e07c53e5ac91db0960870518e243b7c1:

  Merge branch 'py/remove-tcloo' (2020-03-19 21:29:19 +0530)

----------------------------------------------------------------
Christian Stimming (3):
      git-gui: update pot template and German translation to current source code
      git-gui: extend translation glossary template with more terms
      git-gui: update German translation

Luke Bonanomi (1):
      git-gui--askpass: coerce answers to UTF-8 on Windows

Pratyush Yadav (9):
      Merge branch 'cs/german-translation'
      git-gui: add missing close bracket
      Merge branch 'py/missing-bracket'
      git-gui: fix error popup when doing blame -> "Show History Context"
      Merge branch 'py/blame-status-error'
      Merge branch 'js/askpass-coerce-utf8'
      git-gui: reduce Tcl version requirement from 8.6 to 8.5
      git-gui: create a new namespace for chord script evaluation
      Merge branch 'py/remove-tcloo'

 git-gui--askpass                 |    5 +
 git-gui.sh                       |   14 +-
 lib/chord.tcl                    |   56 +-
 lib/index.tcl                    |   10 +-
 lib/merge.tcl                    |    2 +-
 po/de.po                         | 3622 ++++++++++++++++++++------------------
 po/git-gui.pot                   | 2526 ++++++++++++++------------
 po/glossary/de.po                |  315 +++-
 po/glossary/git-gui-glossary.pot |  250 ++-
 po/glossary/git-gui-glossary.txt |  101 +-
 10 files changed, 3981 insertions(+), 2920 deletions(-)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [GIT PULL] git-gui pull request
@ 2020-01-08 19:00 Pratyush Yadav
  0 siblings, 0 replies; 16+ messages in thread
From: Pratyush Yadav @ 2020-01-08 19:00 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Hi Junio,

Please pull the new changes in git-gui for the upcoming Git v2.25 release.

---
The following changes since commit b524f6b399c77b40c8bf2b6217585fde4731472a:

  Merge branch 'ka/japanese-translation' (2019-10-14 23:22:50 +0530)

are available in the Git repository at:

  https://github.com/prati0100/git-gui.git

for you to fetch changes up to 0d2116c6441079a5a1091e4cf152fd9d5fa9811b:

  Merge branch 'zs/open-current-file' (2020-01-05 02:38:03 +0530)

----------------------------------------------------------------
Jonathan Gilbert (3):
      git-gui: consolidate naming conventions
      git-gui: update status bar to track operations
      git-gui: revert untracked files by deleting them

Kazuhiro Kato (1):
      git gui: fix branch name encoding error

Pratyush Yadav (5):
      Merge branch 'jg/revert-untracked'
      Merge branch 'kk/branch-name-encoding'
      git-gui: allow closing console window with Escape
      Merge branch 'py/console-close-esc'
      Merge branch 'zs/open-current-file'

Zoli Szabó (1):
      git-gui: allow opening currently selected file in default app

 git-gui.sh                |  61 ++++--
 lib/blame.tcl             |  24 ++-
 lib/branch.tcl            |   2 +
 lib/checkout_op.tcl       |  15 +-
 lib/choose_repository.tcl | 120 +++++++----
 lib/chord.tcl             | 160 ++++++++++++++
 lib/console.tcl           |   2 +
 lib/index.tcl             | 523 ++++++++++++++++++++++++++++++++++------------
 lib/merge.tcl             |  14 +-
 lib/status_bar.tcl        | 231 +++++++++++++++++---
 10 files changed, 920 insertions(+), 232 deletions(-)
 create mode 100644 lib/chord.tcl

-- 
Regards,
Pratyush Yadav

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL] git-gui pull request
  2019-11-02 23:50 Pratyush Yadav
@ 2019-11-04 22:11 ` Pratyush Yadav
  0 siblings, 0 replies; 16+ messages in thread
From: Pratyush Yadav @ 2019-11-04 22:11 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

On 03/11/19 05:20AM, Pratyush Yadav wrote:
> Hi Junio,
> 
> There are some changes in git-gui since your last pull. With the 2.24
> release coming up, I figure it is a good time to sync up.
> 
> The list of changes is a bit misleading. A lot of these changes are 
> already in Git's tree, and I retroactively pulled them back in my tree, 
> since these bypassed the "main" git-gui tree. Effectively, the merge of 
> the commit 60c60b6 should be a no-op. [0] for a reminder.
> 
> Sorry for being so late. I didn't realize the release was so close. So
> if this pull request is too much trouble for 2.24, I'm fine if you don't 
> pull it now. We can sync up in 2.25 :).

I see that you did manage to do the merge before the 2.24 release. 
Thanks.

-- 
Regards,
Pratyush Yadav

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [GIT PULL] git-gui pull request
@ 2019-11-02 23:50 Pratyush Yadav
  2019-11-04 22:11 ` Pratyush Yadav
  0 siblings, 1 reply; 16+ messages in thread
From: Pratyush Yadav @ 2019-11-02 23:50 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Hi Junio,

There are some changes in git-gui since your last pull. With the 2.24
release coming up, I figure it is a good time to sync up.

The list of changes is a bit misleading. A lot of these changes are 
already in Git's tree, and I retroactively pulled them back in my tree, 
since these bypassed the "main" git-gui tree. Effectively, the merge of 
the commit 60c60b6 should be a no-op. [0] for a reminder.

Sorry for being so late. I didn't realize the release was so close. So
if this pull request is too much trouble for 2.24, I'm fine if you don't 
pull it now. We can sync up in 2.25 :).

[0] https://public-inbox.org/git/CAGr--=KXqFbivuXHPNecb3dBR_hx8QqWoR4pBGXy7uOiT+ESbg@mail.gmail.com/

---
The following changes since commit f7a8834ba4aa20ec750833cf8d30d9a9fed5eade:

  Merge branch 'bp/amend-toggle-bind' (2019-09-14 23:23:12 +0530)

are available in the Git repository at:

  https://github.com/prati0100/git-gui.git

for you to fetch changes up to b524f6b399c77b40c8bf2b6217585fde4731472a:

  Merge branch 'ka/japanese-translation' (2019-10-14 23:22:50 +0530)

----------------------------------------------------------------
Anders Kaseorg (1):
      git-gui: sort entries in optimized tclIndex

Beat Bolli (1):
      git-gui: search for all current SSH key types

Bert Wesarg (2):
      git-gui: use existing interface to query a path's attribute
      git-gui: support for diff3 conflict style

Birger Skogeng Pedersen (1):
      git-gui: bind CTRL/CMD+numpad ENTER to do_commit

Clemens Buchacher (1):
      git-gui: workaround ttk:style theme use

Johannes Schindelin (6):
      git-gui (MinGW): make use of MSys2's msgfmt
      git gui: fix staging a second line to a 1-line file
      git-gui: avoid exception upon Ctrl+T in an empty list
      git-gui: fix exception when trying to stage with empty file list
      git-gui: allow Ctrl+T to toggle multiple paths
      Fix build with core.autocrlf=true

Martin Ågren (1):
      treewide: correct several "up-to-date" to "up to date"

Pratyush Yadav (8):
      git-gui: call do_quit before destroying the main window
      Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff
      Merge branch 'py/git-git-extra-stuff'
      Merge branch 'js/git-bash-if-available'
      Merge branch 'bw/diff3-conflict-style'
      git-gui: add a readme
      Merge branch 'py/readme'
      Merge branch 'ka/japanese-translation'

Thomas Klaeger (1):
      git-gui (Windows): use git-bash.exe if it is available

Todd Zullinger (1):
      Replace Free Software Foundation address in license notices

kdnakt (1):
      git-gui: improve Japanese translation

Łukasz Stelmach (1):
      git-gui: prevent double UTF-8 conversion

 .gitattributes |   1 +
 Makefile       |   4 +-
 README.md      | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 git-gui.sh     |  65 ++++++++++++++++++---
 lib/commit.tcl |  12 +++-
 lib/diff.tcl   |  34 ++++++-----
 lib/sshkey.tcl |   5 +-
 lib/themed.tcl |  15 +++--
 po/README      |   2 +-
 po/ja.po       |   9 +--
 10 files changed, 284 insertions(+), 37 deletions(-)
 create mode 100644 README.md

-- 
Regards,
Pratyush Yadav

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL] git-gui pull request
  2019-09-17 20:50 ` Denton Liu
  2019-09-17 22:51   ` Denton Liu
@ 2019-09-18 19:23   ` Junio C Hamano
  1 sibling, 0 replies; 16+ messages in thread
From: Junio C Hamano @ 2019-09-18 19:23 UTC (permalink / raw)
  To: Pratyush Yadav; +Cc: Denton Liu, git

Denton Liu <liu.denton@gmail.com> writes:

> Hi Pratyush,
>
> Since you're the maintainer now, you should submit a patch to
> Documentation/SubmittingPatches to change
>
> 	- `git-gui/` comes from git-gui project, maintained by Pat Thoyts:
>
> 		git://repo.or.cz/git-gui.git
>
> to have your own information.

There also is MaintNotes on the todo branch, which I'll take care
of.

FWIW, the following update to the draft release notes will be part
of what I'll push out, together with the "Third batch" update to the
master.

diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt
index e123d2daa6..ff48d8582c 100644
--- a/Documentation/RelNotes/2.24.0.txt
+++ b/Documentation/RelNotes/2.24.0.txt
@@ -11,6 +11,9 @@ Backward compatibility note
 
 UI, Workflows & Features
 
+ * We now have an active interim maintainer for the Git-Gui part of
+   the system.  Praise and thank Pratyush Yadav for volunteering.
+
  * The command line parser learned "--end-of-options" notation; the
    standard convention for scripters to have hardcoded set of options
    first on the command line, and force the command to treat end-user
@@ -28,6 +31,21 @@ UI, Workflows & Features
  * Device-tree files learned their own userdiff patterns.
    (merge 3c81760bc6 sb/userdiff-dts later to maint).
 
+ * "git rebase --rebase-merges" learned to drive different merge
+   strategies and pass strategy specific options to them.
+
+ * A new "pre-merge-commit" hook has been introduced.
+
+ * Command line completion updates for "git -c var.name=val" have been
+   added.
+
+ * The lazy clone machinery has been taught that there can be more
+   than one promisor remote and consult them in order when downloading
+   missing objects on demand.
+
+ * The list-objects-filter API (used to create a sparse/lazy clone)
+   learned to take a combined filter specification.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -39,6 +57,20 @@ Performance, Internal Implementation, Development Support etc.
 
  * Further clean-up of the initialization code.
 
+ * xmalloc() used to have a mechanism to ditch memory and address
+   space resources as the last resort upon seeing an allocation
+   failure from the underlying malloc(), which made the code complex
+   and thread-unsafe with dubious benefit, as major memory resource
+   users already do limit their uses with various other mechanisms.
+   It has been simplified away.
+
+ * Unnecessary full-tree diff in "git log -L" machinery has been
+   optimized away.
+
+ * The http transport lacked some optimization the native transports
+   learned to avoid unnecessary ref advertisement, which has been
+   corrected.
+
 
 Fixes since v2.23
 -----------------
@@ -99,6 +131,10 @@ Fixes since v2.23
    subsequent steps.
    (merge 2c65d90f75 bc/reread-attributes-during-rebase later to maint).
 
+ * Tell cURL library to use the same malloc() implementation, with the
+   xmalloc() wrapper, as the rest of the system, for consistency.
+   (merge 93b980e58f cb/curl-use-xmalloc later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge d1387d3895 en/fast-import-merge-doc later to maint).
    (merge 1c24a54ea4 bm/repository-layout-typofix later to maint).

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [GIT PULL] git-gui pull request
  2019-09-17 20:50 ` Denton Liu
@ 2019-09-17 22:51   ` Denton Liu
  2019-09-18 19:23   ` Junio C Hamano
  1 sibling, 0 replies; 16+ messages in thread
From: Denton Liu @ 2019-09-17 22:51 UTC (permalink / raw)
  To: Pratyush Yadav; +Cc: Junio C Hamano, git, Birger Skogeng Pedersen, Bert Wesarg

On Tue, Sep 17, 2019 at 01:50:51PM -0700, Denton Liu wrote:

[...]

> > ----------------------------------------------------------------
> > Bert Wesarg (2):
> >       git-gui: convert new/amend commit radiobutton to checkbutton
> >       git-gui: add horizontal scrollbar to commit buffer
> > 
> > Birger Skogeng Pedersen (2):
> >       git-gui: add hotkeys to set widget focus
> >       git-gui: add hotkey to toggle "Amend Last Commit"
> > 
> > Pratyush Yadav (9):
> >       git-gui: allow reverting selected lines
> >       git-gui: allow reverting selected hunk
> >       git-gui: return early when patch fails to apply
> >       git-gui: allow undoing last revert
> >       Merge branch 'bp/widget-focus-hotkeys'
> >       Merge branch 'py/revert-hunks-lines'
> >       Merge branch 'bw/amend-checkbutton'
> >       Merge branch 'bw/commit-scrollbuffer'
> >       Merge branch 'bp/amend-toggle-bind'
> 
> Seems like this list is missing
> 
> 	Pat Thoyts (1):
> 		  Merge remote-tracking branch 'philoakley/dup-gui'
> 
> 	Philip Oakley (4):
> 		  git-gui: remove duplicate entries from .gitconfig's gui.recentrepo
> 		  git gui: cope with duplicates in _get_recentrepo
> 		  git gui: de-dup selected repo from recentrepo history
> 		  git gui: allow for a long recentrepo list
> 
> which should be in your PR but aren't in mainline Git yet.

Sorry, my mistake. Turns out these were merged a couple of years ago in
90dbf226ba (Merge branch 'js/msgfmt-on-windows' of ../git-gui into
js/git-gui-msgfmt-on-windows, 2017-07-25).

> 
> > 
> >  git-gui.sh          | 140 ++++++++++++++++++++++++++++++++++++++++------------
> >  lib/checkout_op.tcl |   6 +--
> >  lib/commit.tcl      |   4 +-
> >  lib/diff.tcl        |  96 +++++++++++++++++++++++++++++------
> >  lib/index.tcl       |   8 +--
> >  5 files changed, 199 insertions(+), 55 deletions(-)
> > 
> > -- 
> > Regards,
> > Pratyush Yadav

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [GIT PULL] git-gui pull request
  2019-09-17 20:13 Pratyush Yadav
@ 2019-09-17 20:50 ` Denton Liu
  2019-09-17 22:51   ` Denton Liu
  2019-09-18 19:23   ` Junio C Hamano
  0 siblings, 2 replies; 16+ messages in thread
From: Denton Liu @ 2019-09-17 20:50 UTC (permalink / raw)
  To: Pratyush Yadav; +Cc: Junio C Hamano, git, Birger Skogeng Pedersen, Bert Wesarg

Hi Pratyush,

Since you're the maintainer now, you should submit a patch to
Documentation/SubmittingPatches to change

	- `git-gui/` comes from git-gui project, maintained by Pat Thoyts:

		git://repo.or.cz/git-gui.git

to have your own information.

On Wed, Sep 18, 2019 at 01:43:34AM +0530, Pratyush Yadav wrote:
> Hi Junio,
> 
> There were some topics and discussion related to git-gui in flight. Most 
> of them have been stabilized, and merged in. So I think it's a good time 
> to pull in those changes.
> 
> ---
> The following changes since commit 
> 5ab72271e16ac23c269f5019a74a7b1d65170e47:
> 
>   Merge remote-tracking branch 'philoakley/dup-gui' (2017-03-18 15:35:09 +0000)
> 
> are available in the Git repository at:
> 
>   https://github.com/prati0100/git-gui.git 
> 
> for you to fetch changes up to f7a8834ba4aa20ec750833cf8d30d9a9fed5eade:
> 
>   Merge branch 'bp/amend-toggle-bind' (2019-09-14 23:23:12 +0530)
> 
> ----------------------------------------------------------------
> Bert Wesarg (2):
>       git-gui: convert new/amend commit radiobutton to checkbutton
>       git-gui: add horizontal scrollbar to commit buffer
> 
> Birger Skogeng Pedersen (2):
>       git-gui: add hotkeys to set widget focus
>       git-gui: add hotkey to toggle "Amend Last Commit"
> 
> Pratyush Yadav (9):
>       git-gui: allow reverting selected lines
>       git-gui: allow reverting selected hunk
>       git-gui: return early when patch fails to apply
>       git-gui: allow undoing last revert
>       Merge branch 'bp/widget-focus-hotkeys'
>       Merge branch 'py/revert-hunks-lines'
>       Merge branch 'bw/amend-checkbutton'
>       Merge branch 'bw/commit-scrollbuffer'
>       Merge branch 'bp/amend-toggle-bind'

Seems like this list is missing

	Pat Thoyts (1):
		  Merge remote-tracking branch 'philoakley/dup-gui'

	Philip Oakley (4):
		  git-gui: remove duplicate entries from .gitconfig's gui.recentrepo
		  git gui: cope with duplicates in _get_recentrepo
		  git gui: de-dup selected repo from recentrepo history
		  git gui: allow for a long recentrepo list

which should be in your PR but aren't in mainline Git yet.

> 
>  git-gui.sh          | 140 ++++++++++++++++++++++++++++++++++++++++------------
>  lib/checkout_op.tcl |   6 +--
>  lib/commit.tcl      |   4 +-
>  lib/diff.tcl        |  96 +++++++++++++++++++++++++++++------
>  lib/index.tcl       |   8 +--
>  5 files changed, 199 insertions(+), 55 deletions(-)
> 
> -- 
> Regards,
> Pratyush Yadav

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [GIT PULL] git-gui pull request
@ 2019-09-17 20:13 Pratyush Yadav
  2019-09-17 20:50 ` Denton Liu
  0 siblings, 1 reply; 16+ messages in thread
From: Pratyush Yadav @ 2019-09-17 20:13 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git, Birger Skogeng Pedersen, Bert Wesarg

Hi Junio,

There were some topics and discussion related to git-gui in flight. Most 
of them have been stabilized, and merged in. So I think it's a good time 
to pull in those changes.

---
The following changes since commit 
5ab72271e16ac23c269f5019a74a7b1d65170e47:

  Merge remote-tracking branch 'philoakley/dup-gui' (2017-03-18 15:35:09 +0000)

are available in the Git repository at:

  https://github.com/prati0100/git-gui.git 

for you to fetch changes up to f7a8834ba4aa20ec750833cf8d30d9a9fed5eade:

  Merge branch 'bp/amend-toggle-bind' (2019-09-14 23:23:12 +0530)

----------------------------------------------------------------
Bert Wesarg (2):
      git-gui: convert new/amend commit radiobutton to checkbutton
      git-gui: add horizontal scrollbar to commit buffer

Birger Skogeng Pedersen (2):
      git-gui: add hotkeys to set widget focus
      git-gui: add hotkey to toggle "Amend Last Commit"

Pratyush Yadav (9):
      git-gui: allow reverting selected lines
      git-gui: allow reverting selected hunk
      git-gui: return early when patch fails to apply
      git-gui: allow undoing last revert
      Merge branch 'bp/widget-focus-hotkeys'
      Merge branch 'py/revert-hunks-lines'
      Merge branch 'bw/amend-checkbutton'
      Merge branch 'bw/commit-scrollbuffer'
      Merge branch 'bp/amend-toggle-bind'

 git-gui.sh          | 140 ++++++++++++++++++++++++++++++++++++++++------------
 lib/checkout_op.tcl |   6 +--
 lib/commit.tcl      |   4 +-
 lib/diff.tcl        |  96 +++++++++++++++++++++++++++++------
 lib/index.tcl       |   8 +--
 5 files changed, 199 insertions(+), 55 deletions(-)

-- 
Regards,
Pratyush Yadav

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2021-02-27 20:48 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-21 13:12 [GIT PULL] git-gui pull request Pratyush Yadav
2020-05-21 18:08 ` Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2021-02-26 16:10 Pratyush Yadav
2021-02-27 20:47 ` Junio C Hamano
2020-12-18 19:51 Pratyush Yadav
2020-12-19  5:24 ` Junio C Hamano
2020-07-19  9:45 Pratyush Yadav
2020-07-20 19:03 ` Junio C Hamano
2020-03-19 16:15 Pratyush Yadav
2020-01-08 19:00 Pratyush Yadav
2019-11-02 23:50 Pratyush Yadav
2019-11-04 22:11 ` Pratyush Yadav
2019-09-17 20:13 Pratyush Yadav
2019-09-17 20:50 ` Denton Liu
2019-09-17 22:51   ` Denton Liu
2019-09-18 19:23   ` Junio C Hamano

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.