git/git-gui/lib, branch v1.6.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://www.git.shady.money/git/atom?h=v1.6.22008-12-18T05:56:48ZMerge git://repo.or.cz/git-gui2008-12-18T05:56:48ZJunio C Hamanogitster@pobox.com2008-12-18T05:56:48Zurn:sha1:b4955fb611ce407ef0e522862c60ae0472dbfe5e
* git://repo.or.cz/git-gui:
git-gui 0.12
git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL
git-gui: Update Hungarian translation for 0.12
git-gui: Fixed typos in Swedish translation.
git-gui: Updated Swedish translation (515t0f0u).
git gui: update Italian translation
git-gui: Update Japanese translation for 0.12
git-gui: Starting translation for Norwegian
git-gui: Update German (completed) translation.
git-gui: Update po template to include 'Mirroring %s' message
git-gui: Fix commit encoding handling.
git-gui: Fix handling of relative paths in blame.
Merge git://repo.or.cz/git-gui2008-12-02T23:27:05ZJunio C Hamanogitster@pobox.com2008-12-02T23:27:05Zurn:sha1:ed56049058284d7df2ede1ce5f494a2a9a109479
* git://repo.or.cz/git-gui:
git-gui: Teach start_push_anywhere_action{} to notice when remote is a mirror.
Merge git://repo.or.cz/git-gui2008-11-16T23:51:11ZJunio C Hamanogitster@pobox.com2008-11-16T23:51:11Zurn:sha1:6e13921b4f7adcc7316a76c0c4955b85b1589a65
* git://repo.or.cz/git-gui:
git-gui: Fix the search bar destruction handler.
Update the po template
git-gui: Implement automatic rescan after Tool execution.
git-gui: Allow Tools request arguments from the user.
git-gui: Add a Tools menu for arbitrary commands.
git-gui: Fix the after callback execution in rescan.
git-gui: Implement system-wide configuration handling.
git-gui: try to provide a window icon under X
Merge git://repo.or.cz/git-gui2008-11-13T05:12:41ZJunio C Hamanogitster@pobox.com2008-11-13T05:12:41Zurn:sha1:0f639abb68b29f6d4cd9b89ecfb66e41136dcfa3
* git://repo.or.cz/git-gui:
git-gui: Request blame metadata in utf-8.
git-gui: Add the Show SSH Key item to the clone dialog.
git-gui: Fix focus transition in the blame viewer.
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
Merge branch 'maint' of git://repo.or.cz/git-gui into maint2008-09-06T23:03:22ZJunio C Hamanogitster@pobox.com2008-09-06T23:03:22Zurn:sha1:1b118da8bd1878d78589afd9f755b9d52a9579ad
* 'maint' of git://repo.or.cz/git-gui:
git-gui: Fix diff parsing for lines starting with "--" or "++"
git-gui: Fix string escaping in po2msg.sh
git gui: show diffs with a minimum of 1 context line
git-gui: update all remaining translations to French.
git-gui: Update french translation
Merge git://repo.or.cz/git-gui2008-07-30T07:18:26ZJunio C Hamanogitster@pobox.com2008-07-30T07:18:26Zurn:sha1:731ab1f55e7ba736b24708a63e93a7c8d581a4d6
* git://repo.or.cz/git-gui:
git-gui (Windows): Change wrapper to execdir 'libexec/git-core'
git-gui (Windows): Switch to relative discovery of oguilib
git-gui: Correct installation of library to be $prefix/share
git-gui: Fix gitk search in $PATH to work on Windows
git-gui: Preserve scroll position on reshow_diff.
git-gui: Fix the Remote menu separator.
Merge git://repo.or.cz/git-gui2008-07-27T21:09:25ZJunio C Hamanogitster@pobox.com2008-07-27T21:09:25Zurn:sha1:392f1300911120fbaa4b77c737fe13e205726aca
* git://repo.or.cz/git-gui:
git-gui: "Stage Line": Treat independent changes in adjacent lines better
git-gui: Fix "Stage/Unstage Line" with one line of context.
git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk
git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core
Add a menu item to invoke full copy detection in blame.
Kill the blame back-end on window close.
Add options to control the search for copies in blame.
Fix pre-commit hooks under MinGW/MSYS