summaryrefslogtreecommitdiff
path: root/gitk-git
Commit message (Collapse)AuthorAgeFilesLines
* Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2017-01-1815-382/+1901
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://ozlabs.org/~paulus/gitk: gitk: Remove translated message from comments gitk: ru.po: Update Russian translation gitk: Update copyright notice to 2016 gitk: Clear array 'commitinfo' on reload gitk: Remove closed file descriptors from $blobdifffd gitk: Turn off undo manager in the text widget gitk: Fix Japanese translation for "marked commit" gitk: Fix missing commits when using -S or -G gitk: Use explicit RGB green instead of "lime" gitk: Add Portuguese translation gitk: Makefile: create install bin directory gitk: Include commit title in branch dialog gitk: Allow checking out a remote branch gitk: Add a 'rename' option to the branch context menu
* \ Merge branch 'master' of git://ozlabs.org/~paulus/gitkJunio C Hamano2016-03-204-804/+788
|\ \ | |/ | | | | | | | | | | | | | | * 'master' of git://ozlabs.org/~paulus/gitk: gitk: Follow themed bgcolor in help dialogs gitk: fr.po: Sync translations with git gitk: Update French translation (311t) gitk: Update German translation gitk: Update Bulgarian translation (311t)
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2015-12-213-664/+680
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://ozlabs.org/~paulus/gitk: gitk: sv.po: Update Swedish translation (311t) gitk: Let .bleft.mid widgets 'breathe' gitk: Match ttk fonts to gitk fonts gitk: Update revision date in Japanese PO file gitk: Update "Language:" header gitk: Improve translation message gitk: Remove unused line gitk: Update year gitk: Change last translator line gitk: Update fuzzy messages gitk: Update Japanese translation gitk: Fix translation around copyright sign gitk: Update Japanese translation gitk: Fix wrong translation gitk: Translate Japanese catalog gitk: Translate more to Japanese catalog gitk: Update Japanese message catalog gitk: Re-sync line number in Japanese message catalogue gitk: Color name update
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2015-10-3013-531/+450
|\ \ | |/ | | | | | | | | | | | | | | | | | | * git://ozlabs.org/~paulus/gitk: gitk: Update Russian translation gitk: Add accelerator to German locale gitk: Add accelerators to Japanese locale gitk: Update msgid's for menu items with accelerator gitk: l10n: Update Catalan translation gitk: Add missing accelerators Updated Vietnamese translation
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2015-09-1413-3515/+3749
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://ozlabs.org/~paulus/gitk: gitk: Accelerators for the main menu gitk: Adjust the menu line numbers to compensate for the new entry gitk: Add a "Copy commit summary" command gitk: Update Bulgarian translation (307t) gitk: Update .po files gitk: Update Bulgarian translation (304t) gitk: Use translated version of "Command line" in getcommitlines gitk: Make it easier to go quickly to a specific commit gitk: Show the current view's name in the window title gitk: Add mouse right-click options to copy path and branch name gitk: Remove mc parameter from proc show_error gitk: Fix error when changing colors after closing "List references" window gitk: Replace catch {unset foo} with unset -nocomplain foo gitk: Rearrange window title to be more conventional gitk: sv.po: Update Swedish translation (305t0f0u) gitk: Fix bad English grammar "Matches none Commit Info"
* | Merge branch 'master' of git://ozlabs.org/~paulus/gitkJunio C Hamano2015-03-2413-3482/+6449
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://ozlabs.org/~paulus/gitk: gitk: Update .po files gitk: l10n: Add Catalan translation gitk: Fix typo in Russian translation gitk: Remove tcl-format flag from a message that shouldn't have it gitk: Pass --invert-grep option down to "git log" gitk: Synchronize config file writes gitk: Report errors in saving config file gitk: Only write changed configuration variables gitk: Enable mouse horizontal scrolling in diff pane gitk: Default wrcomcmd to use --pretty=email
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2014-10-301-69/+23
|\ \ | |/ | | | | | | | | | | * git://ozlabs.org/~paulus/gitk: gitk: Remove boilerplate for configuration variables gitk: Show detached HEAD if --all is specified gitk: Do not depend on Cygwin's "kill" command on Windows
* | Merge branch 'master' of git://ozlabs.org/~paulus/gitkJunio C Hamano2014-08-102-323/+341
|\ \ | |/ | | | | | | | | * 'master' of git://ozlabs.org/~paulus/gitk: gitk: Updated Bulgarian translation (302t,0f,0u) gitk: Add keybinding to switch to parent commit
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2014-06-271-6/+18
|\ \ | |/ | | | | | | | | | | | | * git://ozlabs.org/~paulus/gitk: gitk: Add visiblerefs option, which lists always-shown branches gitk: Catch mkdtemp errors gitk: Use mktemp -d to avoid predictable temporary directories gitk: Honor TMPDIR when viewing external diffs
* | Merge early parts from git://ozlabs.org/~paulus/gitk.gitJunio C Hamano2014-06-262-6/+1391
|\ \ | |/ | | | | | | | | | | | | | | * master~2: gitk: Show staged submodules regardless of ignore config gitk: Allow displaying time zones from author and commit dates timestamps gitk: Switch to patch mode when searching for line origin gitk: Replace SHA1 entry field on keyboard paste l10n: Init Vietnamese translation
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2014-01-233-11/+1396
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 'master' of git://ozlabs.org/~paulus/gitk: gitk: Indent word-wrapped lines in commit display header gitk: Comply with XDG base directory specification gitk: Replace "next" and "prev" buttons with down and up arrows gitk: chmod +x po2msg.sh gitk: Update copyright dates gitk: Add Bulgarian translation (304t) gitk: Fix mistype
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2013-12-091-210/+353
|\ \ | |/ | | | | | | | | | | | | | | | | * git://ozlabs.org/~paulus/gitk: gitk: Recognize -L option gitk: Support showing the gathered inline diffs gitk: Split out diff part in $commitinfo gitk: Refactor per-line part of getblobdiffline and its support gitk: Support -G option from the command line gitk: Tag display improvements
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2013-05-171-295/+338
|\ \ | |/ | | | | | | * git://ozlabs.org/~paulus/gitk: gitk: Update Swedish translation (304t)
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2013-05-131-55/+199
|\ \ | |/ | | | | | | | | | | | | | | | | | | * git://ozlabs.org/~paulus/gitk: gitk: On OSX, bring the gitk window to front gitk: Add support for -G'regex' pickaxe variant gitk: Add menu item for reverting commits gitk: Simplify file filtering gitk: Display the date of a tag in a human-friendly way gitk: Improve behaviour of drop-down lists gitk: Move hard-coded colors to .gitk
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2013-01-302-2/+16
|\ \ | |/ | | | | | | * git://ozlabs.org/~paulus/gitk: gitk: Ignore gitk-wish buildproduct
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2013-01-232-365/+504
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://ozlabs.org/~paulus/gitk: gitk: Display important heads even when there are many gitk: Improve display of list of nearby tags and heads gitk: Fix display of branch names on some commits gitk: Update Swedish translation (296t) gitk: When searching, only highlight files when in Patch mode gitk: Fix error message when clicking on a connecting line gitk: Fix crash when not using themed widgets gitk: Use bindshiftfunctionkey to bind Shift-F5 gitk: Refactor code for binding modified function keys gitk: Work around empty back and forward images when buttons are disabled gitk: Highlight first search result immediately on incremental search gitk: Highlight current search hit in orange gitk: Synchronize highlighting in file view when scrolling diff
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2012-09-121-0/+5
|\ \ | |/ | | | | | | * git://ozlabs.org/~paulus/gitk: gitk: Fix GIT_TRACE issues
* | Merge branch 'da/gitk-reload-tag-contents'Junio C Hamano2012-09-121-8/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | After overwriting a tag with a new tag, "Reread references" action in "gitk" correctly moved the marker in the display, but it failed to discard a cached contents of the tag (even "Reload" didn't). * da/gitk-reload-tag-contents: gitk: Rename 'tagcontents' to 'cached_tagcontent' gitk: Teach "Reread references" to reload tags gitk: Avoid Meta1-F5
* | Merge branch 'pt/gitk'Junio C Hamano2012-04-021-1/+2
|\ \ | |/ | | | | | | | | * pt/gitk: gitk: fix setting font display with new tabbed dialog layout. gitk: fix tabbed preferences construction when using tcl 8.4
* | Merge gitk changes from Paul Mackerras at git://ozlabs.org/~paulus/gitkJunio C Hamano2012-03-241-130/+282
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * git://ozlabs.org/~paulus/gitk: gitk: Teach gitk to respect log.showroot gitk: Add menu items for comparing a commit with the marked commit gitk: Speed up resolution of short SHA1 ids gitk: Use symbolic font names "sans" and "monospace" when available gitk: Skip over AUTHOR/COMMIT_DATE when searching all fields gitk: Make "git describe" output clickable, too gitk: Fix the display of files when filtered by path gitk: Use a tabbed dialog to edit preferences gitk: Use "gitk: repo-top-level-dir" as window title
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2011-12-161-45/+65
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://ozlabs.org/~paulus/gitk: gitk: Make vi-style keybindings more vi-like gitk: Make "touching paths" search support backslashes gitk: Show modified files with separate work tree gitk: Simplify calculation of gitdir gitk: Run 'git rev-parse --git-dir' only once gitk: Put temporary directory inside .git gitk: Fix "External diff" with separate work tree gitk: Fix "blame parent commit" with separate work tree gitk: Fix "show origin of this line" with separate work tree gitk: Fix file highlight when run in subdirectory gitk: Update copyright gitk: When a commit contains a note, mark it with a yellow box gitk: Remember time zones from author and commit timestamps gitk: Remove unused $cdate array
* | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2011-04-112-23/+27
|\ \ | |/ | | | | | | | | | | | | | | * 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'Junio C Hamano2011-01-081-0/+0
|\ \ | | | | | | | | | | | | * maint: Mark gitk script executable
| * | Mark gitk script executableAnders Kaseorg2011-01-081-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <andersk@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2010-12-143-305/+1654
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | * 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/gitkJunio C Hamano2010-04-189-44/+60
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/gitkJunio C Hamano2010-02-051-1/+1
|\ \ | |/ | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix copyright symbol in About box message
* | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2010-01-296-889/+3989
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/gitkJunio C Hamano2009-12-092-274/+1816
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/gitkJunio C Hamano2009-09-202-259/+618
|\ \ | |/ | | | | | | | | | | * 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/gitkJunio C Hamano2009-08-161-7/+24
|\ \ | |/ | | | | | | | | | | | | * 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
* | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2009-06-202-348/+479
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Allow diff view without context lines gitk: Add another string to translation gitk: Add option 'Simple history' to the options menu gitk: Handle msysGit version during version comparisons gitk: Make more options easily accessible from Edit View dialog gitk: Check git version before using --textconv flag gitk: Use --textconv to generate diff text gitk: Update German translation.
* | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2009-04-302-25/+1381
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Add Russian translation gitk: Fix compare-commits function when we have local changes gitk: Avoid crash if closed while reading references gitk: Handle external diff tool with spaces in the path gitk: Remember and restore the window state with the geometry gitk: Map KP_Divide to focus the search box gitk: Mark some more strings for translation gitk: Mark forgotten string for translation gitk: Make .gitk a hidden file under windows gitk: Add a command to compare two strings of commits gitk: Add a way to mark a commit, plus a "find descendant" command gitk: Fixes for Mac OS X TkAqua gitk: Provide a 32x32 window icon based on the git logo gitk: Provide a window icon if possible gitk: Handle blobs containing a DOS end-of-file marker
* | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2009-03-011-4/+6
|\ \ | |/ | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix possible infinite loop and display corruption
* | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-12-212-63/+213
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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/gitkJunio C Hamano2008-12-022-17/+55
|\ \ | |/ | | | | | | | | | | | | | | | | * 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/gitkJunio C Hamano2008-11-301-93/+157
|\ \ | |/ | | | | | | | | | | | | * 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/gitkJunio C Hamano2008-11-131-227/+810
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/gitkJunio C Hamano2008-10-205-1067/+1340
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <Return> 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 <Button-2> for context menus on OSX
* | Merge updated git-gui and gitk that call each otherJunio C Hamano2008-09-061-1/+43
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/gitkJunio C Hamano2008-08-161-6/+8
|\ \ | |/ | | | | | | * 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/gitkJunio C Hamano2008-08-063-324/+422
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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/gitkJunio C Hamano2008-06-111-20/+30
|\ \ | |/ | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Handle detached heads better
* | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-05-232-23/+29
|\ \ | |/ | | | | | | | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload" gitk: Fix bug where current row number display stops working gitk: Move es.po where it belongs gitk: Fix "wrong # coordinates" error on reload
| * gitk: Move es.po where it belongsMichele Ballabio2008-05-191-890/+0
| | | | | | | | | | Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-05-145-888/+4028
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: (44 commits) gitk: Add a progress bar for checking out a head gitk: Show current row number and total number of rows gitk: Allow users to view diffs in external diff viewer gitk: Synchronize highlighting in file view for 'f' and 'b' commands gitk: Make updates go faster gitk: Disable "Reset %s branch to here" when on a detached head gitk: German translation again updated gitk: Update German translation gitk: Makefile/install: force permissions when installing files and dirs gitk: Initial Swedish translation. gitk: Spanish translation of gitk gitk: Fix handling of tree file list with special chars in names gitk: Reorganize processing of arguments for git log gitk: Fix problem with target row not being in scroll region gitk: Avoid a crash in selectline if commitinfo($id) isn't set gitk: Fix some corner cases in computing vrowmod and displayorder gitk: Correct a few strings and comments to say "git log" gitk: Don't filter view arguments through git rev-parse gitk: Fix problems with target row stuff gitk: Handle updating with path limiting better ...
| * gitk: Spanish translation of gitkSantiago Gala2008-05-021-0/+890
| | | | | | | | | I copied the Italian translation and translated the strings to Spanish starting from there. This incorporates suggestions from Wincent Colaiuta and Carlos Rica. Signed-off-by: Santiago Gala <sgala@apache.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-04-071-3/+3
| | | | | * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix changing colors through Edit->Preferences
* Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-03-143-26/+980
| | | | | | | | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: gitk: initial Italian translation gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -d gitk: Avoid Tcl error when switching views [PATCH] gitk: Don't show local changes when we there is no work tree [PATCH] gitk: Add horizontal scrollbar to the diff view [PATCH] gitk: make autoselect optional [PATCH] gitk: Mark another string for translation [PATCH] Add an --argscmd flag to get the list of refs to show gitk: Only restore window size from ~/.gitk, not position
* Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-02-161-1/+2
| | | | | * git://git.kernel.org/pub/scm/gitk/gitk: [PATCH] gitk: Heed the lines of context in merge commits