user/sven/git.git/gitk-git, branch v1.7.7.4

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

2011-04-11T16:33:06Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Update cherry-pick error message parsing gitk: Quote tag names in event bindings to avoid problems with % chars gitk: Allow user to control how much of the SHA1 ID gets auto-selected gitk: spelling fixes in Russian translation gitk: Take only numeric version components when computing $git_version

Merge branch 'maint'

2011-01-09T07:48:47Z

* maint: Mark gitk script executable

Mark gitk script executable

2011-01-09T07:34:02Z

The executable bit on gitk-git/gitk was lost (accidentally it seems) by commit 62ba5143ec2ab9d4083669b1b1679355e7639cd5. Put it back, so that gitk can be run directly from a git.git checkout. Note that the script is already executable in gitk.git, just not in git.git. Signed-off-by: Anders Kaseorg Signed-off-by: Junio C Hamano

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

2010-12-14T17:09:13Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Add Brazilian Portuguese (pt-BR) translation gitk: Make text selectable on Mac gitk: Prevent the text pane from becoming editable gitk: Add the equivalent of diff --color-words gitk: Update Swedish translation (290t) gitk: Show notes by default (like git log does)

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

2010-04-19T01:36:41Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Display dirty submodules correctly gitk: Fix display of copyright symbol gitk: Add emacs editor variable block gitk: Avoid calling tk_setPalette on Windows gitk: Don't clobber "Remember this view" setting gitk: Add comments to explain encode_view_opts and decode_view_opts gitk: Use consistent font for all text input fields gitk: Set the font for all listbox widgets gitk: Set the font for all spinbox widgets gitk: Remove forced use of sans-serif font gitk: Add Ctrl-W shortcut for closing the active window

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

2010-02-06T05:22:59Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix copyright symbol in About box message

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

2010-01-29T20:57:44Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Update German translation gitk: Add French translation gitk: update Italian translation gitk: Update Swedish translation gitk: Adjust two equal strings which differed in whitespace gitk: Display submodule diffs with appropriate encoding gitk: Fix display of newly-created tags gitk: Enable gitk to create tags with messages gitk: Update Hungarian translation gitk: Add Hungarian translation gitk: Add "--no-replace-objects" option

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

2009-12-09T23:38:42Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix selection of tags gitk: Default to the system colours on Windows gitk: Update Japanese translation gitk: Fix "git gui blame" invocation when called from top-level directory gitk: Disable checkout of remote branches gitk: Improve appearance of radiobuttons and checkbuttons gitk: Skip translation of "wrong Tcl version" message gitk: Add Japanese translation gitk: Use the --submodule option for displaying diffs when available gitk: Fix diffing committed -> staged (typo in diffcmd) gitk: Add configuration for UI colour scheme gitk: Don't compare fake children when comparing commits gitk: Show diff of commits at end of compare-commits output gitk: Add a user preference to enable/disable use of themed widgets gitk: Fix errors in the theme patch gitk: Use themed tk widgets gitk: Restore scrolling position of diff pane on back/forward in history

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

2009-09-21T06:47:52Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Work around leftover temporary save file gitk: Show diff of commits at end of compare-commits output gitk: Update Swedish translation (280t0f0u)

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

2009-08-16T10:46:51Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Parse arbitrary commit-ish in SHA1 field gitk: Fix direction of symmetric difference in optimized mode gitk: New option to hide remote refs gitk: Do not hard-code "encoding" in attribute lookup functions