git/git-gui/lib/mergetool.tcl, branch v2.50.0Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.50.02024-11-11T03:47:44ZMerge https://github.com/j6t/git-gui2024-11-11T03:47:44ZJunio C Hamanogitster@pobox.com2024-11-11T03:47:44Zurn:sha1:b31fb630c0fc6869a33ed717163e8a1210460d94
* https://github.com/j6t/git-gui:
git gui: add directly calling merge tool from configuration
git-gui: strip commit messages less aggressively
git-gui: strip comments and consecutive empty lines from commit messages
Merge https://github.com/prati0100/git-gui2020-05-21T18:15:04ZJunio C Hamanogitster@pobox.com2020-05-21T18:15:04Zurn:sha1:ae92ac8ae3838e72840f5d019195bb9c0c9e7b0e
* https://github.com/prati0100/git-gui:
git-gui: Handle Ctrl + BS/Del in the commit msg
Subject: git-gui: fix syntax error because of missing semicolon
Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui2013-06-17T03:06:55ZJunio C Hamanogitster@pobox.com2013-06-17T03:06:55Zurn:sha1:fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c
git-gui 0.18.0
* tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui:
git-gui 0.18
git-gui: avoid an error message when removing the last remote
git-gui: fix file name handling with non-empty prefix
git-gui: bring wish process to front on Mac
git-gui: change dialog button positions for Windows to suit platform.
git-gui: allow "\ No newline at end of file" for linewise staging
git-gui: fix the mergetool launcher for the Beyond Compare tool.
Makefile: replace "echo 1>..." with "echo >..."
French translation: copy -> copie.
git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree>
Merge git-gui 0.14.02011-03-26T17:42:35ZJunio C Hamanogitster@pobox.com2011-03-26T17:42:26Zurn:sha1:42f98745732c68baa6d79a50eab0d726b549025dMerge git://repo.or.cz/git-gui2009-05-02T05:11:57ZJunio C Hamanogitster@pobox.com2009-05-02T05:11:57Zurn:sha1:a8816e7bab0354badd915c1da09421a64c982831
* git://repo.or.cz/git-gui:
git-gui: Fixes for Mac OS X TkAqua
git-gui: Update Russian translation
git-gui: run post-checkout hook after clone
git-gui: Ensure consistent usage of mergetool.keepBackup
git-gui: fix use of undeclared variable diff_empty_count
git-gui (Win): make starting via "Git GUI Here" on .git/ possible
git-gui (Win): make "Explore Working Copy" more robust
git-gui: run post-checkout hook on checkout
git-gui: When calling post-commit hook wrong variable was cleared.
git-gui: use `git --html-path` to get the location of installed HTML docs
git-gui: fix deleting from the context menu with empty selection
git-gui: minor spelling fix and string factorisation.
git-gui: various French translation fixes
git-gui: Fix merge conflict display error when filename contains spaces
git-gui: don't hide the Browse button when resizing the repo chooser
Append ampersand to "Target" of lnk files created by do_cygwin_shortcut
git-gui: Support more git version notations.
git-gui: Avoid an infinite rescan loop in handle_empty_diff.
git-gui: Fix post-commit status with subject in non-locale encoding
Merge git://repo.or.cz/git-gui2008-11-02T05:31:46ZJunio C Hamanogitster@pobox.com2008-11-02T05:31:46Zurn:sha1:f6576f4c0c6fa3b2d979faf28936c09480dedaab
* git://repo.or.cz/git-gui: (27 commits)
git-gui: Update German translation.
git-gui: Do not munge conflict marker lines in a normal diff
git-gui: Add a simple implementation of SSH_ASKPASS.
git-gui: Add a dialog that shows the OpenSSH public key.
git-gui: Mark-up strings in show_{other,unmerged}_diff() for localization
git-gui: Show a round number of bytes of large untracked text files
git-gui: Fix the blame viewer destroy handler.
git-gui: Add a search command to the blame viewer.
git-gui: Fix the blame window shape.
git-gui: Fix switch statement in lib/merge.tcl
git-gui: Fix fetching from remotes when adding them
git-gui: Fix removing non-pushable remotes
git-gui: Make input boxes in init/clone/open dialogs consistent
git-gui: Avoid using the term URL when specifying repositories
git-gui: gui.autoexplore makes explorer to pop up automatically after picking
git-gui: Add Explore Working Copy to the Repository menu
git-gui: Use git web--browser for web browsing
git-gui: mkdir -p when initializing new remote repository
git-gui: Add support for removing remotes
git-gui: Add support for adding remotes
...
Merge git://repo.or.cz/git-gui2008-09-25T15:41:07ZShawn O. Pearcespearce@spearce.org2008-09-25T15:41:07Zurn:sha1:1500f7bc1366e71edb7e8a31f3cf5614e9591cc2
* git://repo.or.cz/git-gui:
git-gui: Reenable staging unmerged files by clicking the icon.
git-gui: Support the encoding menu in gui blame.
git-gui: Optimize encoding name resolution using a lookup table.
git-gui: Allow forcing display encoding for diffs using a submenu.
git-gui: Add a menu of available encodings.
git-gui: Cleanup handling of the default encoding.
git-gui: Assume `blame --incremental` output is in UTF-8
git-gui: Use gitattribute "encoding" for file content display
git-gui: Add support for calling out to the prepare-commit-msg hook
git-gui: Hide commit related UI during citool --nocommit
git-gui: Add more integration options to citool.
git-gui: Updated German translation.
git-gui: I18n fix sentence parts into full sentences for translation again.
git-gui: Restore ability to Stage Working Copy for conflicts.
git-gui: Fix Blame Parent & Context for working copy lines.
Merge updated git-gui and gitk that call each other2008-09-07T01:06:39ZJunio C Hamanogitster@pobox.com2008-09-07T01:06:39Zurn:sha1:5fc3e67ac0241c491dcf1c0c9dcd4a4d83e7c243
Merge git://repo.or.cz/git-gui and git://git.kernel.org/pub/scm/gitk/gitk
* git://repo.or.cz/git-gui:
git-gui: Show special diffs for complex conflict cases.
git-gui: Make F5 reselect a diff, if an untracked file is selected.
git-gui: Reimplement and enhance auto-selection of diffs.
git-gui: Support conflict states _U & UT.
git-gui: Support more merge tools.
git-gui: Don't allow staging files with conflicts.
git-gui: Support calling merge tools.
git-gui: Support resolving conflicts via the diff context menu.
git-gui: Mark forgotten strings for translation.
git-gui: Allow specifying an initial line for git gui blame.
git-gui: Better positioning in Blame Parent Commit
git-gui: Support passing blame to a parent commit.
git-gui: Support starting gitk from Gui Blame
git-gui: Teach git gui about file type changes
* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Add menu item for calling git gui blame
gitk: Add option to specify the default commit on command line