aboutsummaryrefslogtreecommitdiff
path: root/gitk-git
Commit message (Collapse)AuthorAge
* Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-08-16
|\ | | | | | | | | * 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-06
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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-11
|\ \ | |/ | | | | | | * 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-23
|\ \ | |/ | | | | | | | | | | | | * 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-19
| | | | | | | | | | 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-14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-02
| | | | | | | | | 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-07
| | | | | * 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-14
| | | | | | | | | | | | | * 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-16
| | | | | * git://git.kernel.org/pub/scm/gitk/gitk: [PATCH] gitk: Heed the lines of context in merge commits
* Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-02-13
| | | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: [PATCH] gitk: learn --show-all output [PATCH] gitk: properly deal with tag names containing / (slash) [PATCH] gitk: Add checkbutton to ignore space changes [PATCH] gitk: Fix "Key bindings" message
* Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-01-20
| | | | | * git://git.kernel.org/pub/scm/gitk/gitk: [PATCH] gitk: make Ctrl "+" really increase the font size
* Merge ../gitkJunio C Hamano2008-01-11
| | | | | | | * ../gitk: gitk: Update German translation. gitk: Fix typo in user message. gitk: Fix the Makefile to cope with systems lacking msgfmt
* Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-01-08
| | | | | | | | | | | | | | | * 'master' of git://git.kernel.org/pub/scm/gitk/gitk: [PATCH] gitk: use user-configured background in view definition dialog [PATCH] gitk: Update German translation [PATCH] gitk: Update and fix Makefile gitk: Restore some widget options whose defaults changed in Tk 8.5 gitk: Recode de.po to UTF-8 [PATCH] gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8. [PATCH] gitk i18n: More markup -- various options menus [PATCH] gitk i18n: Initial German translation [PATCH] gitk i18n: Markup several strings for translation [PATCH] gitk i18n: Import msgcat for message string translation; load translation catalogs [PATCH] gitk i18n: Add Makefile with rules for po file creation and installation
* Move gitk to its own subdirectoryJunio C Hamano2007-11-18
This is to prepare for gitk i18n effort that makes gitk not a single file project anymore. We may use subproject to bind git.git and gitk.git more loosely in the future, but we do not want to require everybody to have subproject aware git to be able to pull from git.git yet. Signed-off-by: Junio C Hamano <gitster@pobox.com>