Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Apr 2, 2012
  1. @gitster

    Merge branch 'pt/gitk'

    gitster authored
    * pt/gitk:
      gitk: fix setting font display with new tabbed dialog layout.
      gitk: fix tabbed preferences construction when using tcl 8.4
Commits on Mar 24, 2012
  1. @gitster

    Merge gitk changes from Paul Mackerras at git://ozlabs.org/~paulus/gitk

    gitster authored
    * 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
Commits on Dec 17, 2011
  1. @gitster

    Merge git://ozlabs.org/~paulus/gitk

    gitster authored
    * 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
Commits on Apr 11, 2011
  1. @gitster

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

    gitster authored
    * 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
Commits on Jan 9, 2011
  1. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      Mark gitk script executable
  2. @andersk @gitster

    Mark gitk script executable

    andersk authored gitster committed
    The executable bit on gitk-git/gitk was lost (accidentally it seems) by
    commit 62ba514.  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>
Commits on Dec 14, 2010
  1. @gitster

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

    gitster authored
    * 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)
Commits on Apr 19, 2010
  1. @gitster

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

    gitster authored
    * 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
Commits on Feb 6, 2010
  1. @gitster

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

    gitster authored
    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Fix copyright symbol in About box message
Commits on Jan 29, 2010
  1. @gitster

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

    gitster authored
    * 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
Commits on Dec 9, 2009
  1. @gitster

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

    gitster authored
    * 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
Commits on Sep 21, 2009
  1. @gitster

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

    gitster authored
    * 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)
Commits on Aug 16, 2009
  1. @gitster

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

    gitster authored
    * 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
Commits on Jun 20, 2009
  1. @gitster

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

    gitster authored
    * 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.
Commits on May 1, 2009
  1. @gitster

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

    gitster authored
    * 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
Commits on Mar 2, 2009
  1. @gitster

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

    gitster authored
    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Fix possible infinite loop and display corruption
Commits on Dec 22, 2008
  1. @gitster

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

    gitster authored
    * 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
Commits on Dec 2, 2008
  1. @gitster

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

    gitster authored
    * 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
Commits on Dec 1, 2008
  1. @gitster

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

    gitster authored
    * 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
Commits on Nov 13, 2008
  1. @gitster

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

    gitster authored
    * 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
Commits on Oct 21, 2008
  1. @gitster

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

    gitster authored
    * 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
Commits on Sep 7, 2008
  1. @gitster

    Merge updated git-gui and gitk that call each other

    gitster authored
    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
Commits on Aug 17, 2008
  1. @gitster

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

    gitster authored
    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Allow safely calling nukefile from a run queue handler
Commits on Aug 6, 2008
  1. @gitster

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

    gitster authored
    * 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
Commits on Jun 11, 2008
  1. @gitster

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

    gitster authored
    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Handle detached heads better
Commits on May 24, 2008
  1. @gitster

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

    gitster authored
    * 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
Commits on May 18, 2008
  1. @paulusmack

    gitk: Move es.po where it belongs

    Michele Ballabio authored paulusmack committed
    Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
Commits on May 15, 2008
  1. @gitster

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

    gitster authored
    * 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
      ...
Commits on May 2, 2008
  1. @sgala @paulusmack

    gitk: Spanish translation of gitk

    sgala authored paulusmack committed
    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>
Commits on Apr 8, 2008
  1. @gitster

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

    gitster authored
    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Fix changing colors through Edit->Preferences
Commits on Mar 15, 2008
  1. @gitster

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

    gitster authored
    * 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
Commits on Feb 17, 2008
  1. @gitster

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

    gitster authored
    * git://git.kernel.org/pub/scm/gitk/gitk:
      [PATCH] gitk: Heed the lines of context in merge commits
Commits on Feb 13, 2008
  1. @gitster

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

    gitster authored
    * 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
Commits on Jan 21, 2008
  1. @gitster

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

    gitster authored
    * git://git.kernel.org/pub/scm/gitk/gitk:
      [PATCH] gitk: make Ctrl "+" really increase the font size
Commits on Jan 11, 2008
  1. @gitster

    Merge ../gitk

    gitster authored
    * ../gitk:
      gitk: Update German translation.
      gitk: Fix typo in user message.
      gitk: Fix the Makefile to cope with systems lacking msgfmt
Something went wrong with that request. Please try again.