{"thread":{"id":"52176","subject":"[GIT PULL] git-gui pull request","startedAt":"2019-11-02T23:50:14Z","lastAt":"2019-11-04T22:11:22Z","messageCount":2,"participants":["Pratyush Yadav"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"385325","messageId":"20191102235006.rpguewvbbpfv4wi5@yadavpratyush.com","threadId":"52176","inReplyTo":null,"subject":"[GIT PULL] git-gui pull request","fromName":"Pratyush Yadav","fromEmail":"me@yadavpratyush.com","sentAt":"2019-11-02T23:50:07Z","receivedAt":"2019-11-02T23:50:14Z","isPatch":false,"sender":{"key":"me@yadavpratyush.com","avatar":"https://avatars.githubusercontent.com/u/8817931?v=4"},"body":"Hi Junio,\n\nThere are some changes in git-gui since your last pull. With the 2.24\nrelease coming up, I figure it is a good time to sync up.\n\nThe list of changes is a bit misleading. A lot of these changes are \nalready in Git's tree, and I retroactively pulled them back in my tree, \nsince these bypassed the \"main\" git-gui tree. Effectively, the merge of \nthe commit 60c60b6 should be a no-op. [0] for a reminder.\n\nSorry for being so late. I didn't realize the release was so close. So\nif this pull request is too much trouble for 2.24, I'm fine if you don't \npull it now. We can sync up in 2.25 :).\n\n[0] https://public-inbox.org/git/CAGr--=KXqFbivuXHPNecb3dBR_hx8QqWoR4pBGXy7uOiT+ESbg@mail.gmail.com/\n\n---\nThe following changes since commit f7a8834ba4aa20ec750833cf8d30d9a9fed5eade:\n\n  Merge branch 'bp/amend-toggle-bind' (2019-09-14 23:23:12 +0530)\n\nare available in the Git repository at:\n\n  https://github.com/prati0100/git-gui.git\n\nfor you to fetch changes up to b524f6b399c77b40c8bf2b6217585fde4731472a:\n\n  Merge branch 'ka/japanese-translation' (2019-10-14 23:22:50 +0530)\n\n----------------------------------------------------------------\nAnders Kaseorg (1):\n      git-gui: sort entries in optimized tclIndex\n\nBeat Bolli (1):\n      git-gui: search for all current SSH key types\n\nBert Wesarg (2):\n      git-gui: use existing interface to query a path's attribute\n      git-gui: support for diff3 conflict style\n\nBirger Skogeng Pedersen (1):\n      git-gui: bind CTRL/CMD+numpad ENTER to do_commit\n\nClemens Buchacher (1):\n      git-gui: workaround ttk:style theme use\n\nJohannes Schindelin (6):\n      git-gui (MinGW): make use of MSys2's msgfmt\n      git gui: fix staging a second line to a 1-line file\n      git-gui: avoid exception upon Ctrl+T in an empty list\n      git-gui: fix exception when trying to stage with empty file list\n      git-gui: allow Ctrl+T to toggle multiple paths\n      Fix build with core.autocrlf=true\n\nMartin Ågren (1):\n      treewide: correct several \"up-to-date\" to \"up to date\"\n\nPratyush Yadav (8):\n      git-gui: call do_quit before destroying the main window\n      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\n      Merge branch 'py/git-git-extra-stuff'\n      Merge branch 'js/git-bash-if-available'\n      Merge branch 'bw/diff3-conflict-style'\n      git-gui: add a readme\n      Merge branch 'py/readme'\n      Merge branch 'ka/japanese-translation'\n\nThomas Klaeger (1):\n      git-gui (Windows): use git-bash.exe if it is available\n\nTodd Zullinger (1):\n      Replace Free Software Foundation address in license notices\n\nkdnakt (1):\n      git-gui: improve Japanese translation\n\nŁukasz Stelmach (1):\n      git-gui: prevent double UTF-8 conversion\n\n .gitattributes |   1 +\n Makefile       |   4 +-\n README.md      | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n git-gui.sh     |  65 ++++++++++++++++++---\n lib/commit.tcl |  12 +++-\n lib/diff.tcl   |  34 ++++++-----\n lib/sshkey.tcl |   5 +-\n lib/themed.tcl |  15 +++--\n po/README      |   2 +-\n po/ja.po       |   9 +--\n 10 files changed, 284 insertions(+), 37 deletions(-)\n create mode 100644 README.md\n\n-- \nRegards,\nPratyush Yadav\n"},{"id":"385433","messageId":"20191104221115.hinnt47xm4ba3lzy@yadavpratyush.com","threadId":"52176","inReplyTo":"20191102235006.rpguewvbbpfv4wi5@yadavpratyush.com","subject":"Re: [GIT PULL] git-gui pull request","fromName":"Pratyush Yadav","fromEmail":"me@yadavpratyush.com","sentAt":"2019-11-04T22:11:15Z","receivedAt":"2019-11-04T22:11:22Z","isPatch":false,"sender":{"key":"me@yadavpratyush.com","avatar":"https://avatars.githubusercontent.com/u/8817931?v=4"},"body":"On 03/11/19 05:20AM, Pratyush Yadav wrote:\n> Hi Junio,\n> \n> There are some changes in git-gui since your last pull. With the 2.24\n> release coming up, I figure it is a good time to sync up.\n> \n> The list of changes is a bit misleading. A lot of these changes are \n> already in Git's tree, and I retroactively pulled them back in my tree, \n> since these bypassed the \"main\" git-gui tree. Effectively, the merge of \n> the commit 60c60b6 should be a no-op. [0] for a reminder.\n> \n> Sorry for being so late. I didn't realize the release was so close. So\n> if this pull request is too much trouble for 2.24, I'm fine if you don't \n> pull it now. We can sync up in 2.25 :).\n\nI see that you did manage to do the merge before the 2.24 release. \nThanks.\n\n-- \nRegards,\nPratyush Yadav\n"}]}