git/gitk-git/gitk, branch v1.6.2

Merge git://git.kernel.org/pub/scm/gitk/gitk

2009-03-02T06:20:52Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix possible infinite loop and display corruption

Merge git://git.kernel.org/pub/scm/gitk/gitk

2008-12-22T02:31:12Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Force the focus to the main window on Windows gitk: Allow unbalanced quotes/braces in commit headers gitk: Update German translation gitk: Mark forgotten strings (header sentence parts in color chooser) for translation gitk: Ensure that "Reset branch" menu entry is enabled gitk: Use check-buttons' -text property instead of separate labels gitk: Map / to focus the search box gitk: Fix bugs in blaming code

Merge git://git.kernel.org/pub/scm/gitk/gitk

2008-12-02T23:25:48Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Add a menu option to start git gui gitk: Make line origin search update the busy status gitk: Update German translation gitk: Fix bug in accessing undefined "notflag" variable gitk: Highlight only when search type is "containing:". gitk: Fix context menu items for generating diffs when in tree mode

Merge git://git.kernel.org/pub/scm/gitk/gitk

2008-12-01T06:59:41Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Avoid handling the Return key twice in Add Branch gitk: Show local changes properly when we have a path limit gitk: Fix switch statement in parseviewargs gitk: Index line[hnd]tag arrays by id rather than row number

Merge git://git.kernel.org/pub/scm/gitk/gitk

2008-11-13T16:28:51Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix linehtag undefined error with file highlighting gitk: Fix commit encoding support gitk: Fix transient windows on Win32 and MacOS gitk: Add accelerators to frequently used menu commands gitk: Implement a user-friendly Edit View dialog gitk: Improve cherry-pick error handling gitk: Make cherry-pick call git-citool on conflicts gitk: Make gitk dialog windows transient gitk: Add Return and Escape bindings to dialogs gitk: Cope with unmerged files in local changes gitk: Make "show origin of this line" work on fake commits gitk: Unify handling of merge diffs with normal 2-way diffs gitk: Make the background color of marked lines configurable gitk: Add a menu item to show where a given line comes from gitk: Fix some off-by-one errors in computing which line to blame gitk: Allow starting gui blame for a specific line gitk: Fix file list context menu for merge commits gitk: Allow forcing branch creation if it already exists

Merge git://git.kernel.org/pub/scm/gitk/gitk

2008-10-21T05:16:09Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Turn short SHA1 names into links too gitk: Regenerate .po files gitk: New way of constructing menus that allows for Alt+letter accelerators gitk: Bind Key-Return to create on new branch dialog gitk: Fix binding for in sha1 entry field gitk: Clean up file encoding code and add enable/disable option gitk: Implement batch lookup and caching of encoding attrs gitk: Enhance file encoding support gitk: Add untranslated error messages to translation gitk: Fix a bug in collapsing deeply nested trees gitk: Use for context menus on OSX

Merge updated git-gui and gitk that call each other

2008-09-07T01:06:39Z

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 git://git.kernel.org/pub/scm/gitk/gitk

2008-08-17T06:21:07Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Allow safely calling nukefile from a run queue handler

Merge git://git.kernel.org/pub/scm/gitk/gitk

2008-08-06T20:32:12Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Update swedish translation. gitk: Updated German translation gitk: Fallback to selecting the head commit upon load gitk: Fixed automatic row selection during load gitk: Fixed broken exception handling in diff gitk: On Windows, use a Cygwin-specific flag for kill gitk: Arrange to kill diff-files & diff-index on quit gitk: Kill back-end processes on window close

Merge git://git.kernel.org/pub/scm/gitk/gitk

2008-06-11T23:22:53Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Handle detached heads better