Welcome to git-cola’s Documentation

Introduction

git cola is a simple, powerful, and feature-rich GUI for git that provides an easy way to interact with Git repositories.

Git Cola?

Out of cola? Don’t panic.

Download
Visit the git cola home page
Discuss
git cola mailing list.
Improve
Submit issues and enhancement requests to the git cola issue tracker.
Contribute

git cola on github

git clone git://github.com/git-cola/git-cola.git

Installation

The git cola installation instructions are included in the source tarball.

See the README.md file for more details, or read it on github.

Running git cola

If you’ve already installed cola:

git cola

If you have the git cola source:

make && bin/git-cola

Tools

The git cola interface is composed of various cooperating tools. Double-clicking a tool opens it in its own subwindow. Dragging it around moves and places it within the window.

Tools can be hidden and rearranged however you like. git cola carefully remembers your window layout and restores it the next time it is launched.

A hidden tool can be re-opened using the Tools menu as well as the Alt-1,2,3,…, shortcut keys.

Status

The Status tool provides a visual analog to the git status command.

Status displays files that are modified relative to the staging area, staged for the next commit, unmerged files from an in-progress merge, and files that are untracked to git.

These are the same categories one sees when running git status on the command line.

You can navigate through the list of files using keyboard arrows as well as the ergonomical and vim-like j and k shortcut keys.

There are several convenient ways to interact with files in the Status tool. Selecting a file displays its diff in the Diff viewer. Double-clicking a file stages its contents, as does the the Ctrl-s shortcut key.

Ctrl-e opens selected files in the conifgured $EDITOR, and Ctrl-d opens selected files using git difftool.

Additional actions can be performed using the right-click context menu.

Configuring your $EDITOR

The editor used by Ctrl-e is configured from the Preferences screen. The environment variables $VISUAL and $EDITOR are used when no editor has been configured.

The editor preference is saved in the gui.editor variable using git config.

ProTip – Setting gvim -p as your configured editor opens multiple files using tabs (and gvim -o uses splits).

git cola is {vim, emacs, textpad, notepad++}-aware. When you select a line in the grep screen and press any of Enter, Ctrl-e, or the “Edit” button, you are taken to that exact line.

Actions

Clicking the Staged folder shows a diffstat for the index.

Clicking the Modified folder shows a diffstat for the worktree.

Clicking individual files sends diffs to the Diff Display.

Double-clicking individual files adds and removes their content from the index.

Various actions that are available through the right-click context menu. Different actions are available depending a file’s status.

Staged Files
Unstage Selected
Remove from the index/staging area with git reset
Launch Editor
Launch the configured visual editor
Launch Difftool
Visualize changes with git difftool
Revert Unstaged Edits
Throw away unstaged edits.
Modified Files
Stage Selected
Add to the staging area with git add
Launch Editor
Launches the configured visual text editor
Launch Difftool
Visualize changes relative to the index with git difftool
Revert Unstaged Edits
Reverts unstaged content by checking out selected paths from the index/staging area
Revert Uncommited Edits
Throws away uncommitted edits
Unmerged Files
Launch Merge Tool
Resolve conflicts using git mergetool
Stage Selected
Mark as resolved using git add
Launch Editor
Launch the configured visual text editor
Untracked Files
Stage Selected
Add to the index/staging area with git add
Launch Editor
Launch the configured visual text editor
Delete File(s)
Delete files from the filesystem
Add to .gitignore
Adds file/files to GIT ignore list for untracked files

Diff

The diff viewer/editor displays diffs for selected files. Additions are shown in green and removals are displayed in light red. Extraneous whitespace is shown with a pure-red background.

Right-clicking in the diff provides access to additional actions that use either the cursor location or text selection.

Staging content for commit

The @@ patterns denote a new diff region. Selecting lines of diff and using the Stage Selected command will stage just the selected lines. Clicking within a diff region and selecting Stage Section stages the entire patch region.

The corresponding opposite commands can be performed on staged files as well, e.g. staged content can be selectively removed from the index when we are viewing diffs for staged content.

Commit Message Editor

The git cola commit message editor is a simple text widget for entering commit messages.

You can navigate between the Subject and Extended description… fields using the keyboard arrow keys.

Pressing enter when inside the Subject field jumps down to the extended description field.

The Options button menu to the left of the subject field provides access to the additional actions.

The Ctrl+i keyboard shortcut adds a standard “Signed-off-by: ” line, and Ctrl+Enter creates a new commit using the commit message and staged content.

Sign Off

The Sign Off button adds a standard:

Signed-off-by: A. U. Thor <a.u.thor@example.com>

line to the bottom of the commit message.

Invoking this action is equivalent to passing the -s option to git commit.

Commit

The commit button runs git commit. The contents of the commit message editor is provided as the commit message.

Only staged files are included in the commit – this is the same behavior as running git commit on the command-line.

Line and Column Display

The current line and column number is displayed by the editor. E.g. a 5,0 display means that the cursor is located at line five, column zero.

The display changes colors when lines get too long. Yellow indicates the safe boundary for sending patches to a mailing list while keeping space for inline reply markers.

Orange indicates that the line is starting to run a bit long and should break soon.

Red indicates that the line is running up against the standard 80-column limit for commit messages.

Keeping commit messages less than 76-characters wide is encouraged. git log is a great tool but long lines mess up its formatting for everyone else, so please be mindful when writing commit messages.

Amend Last Commit

Clicking on Amend Last Commit makes git cola amend the previous commit instead of creating a new one. git cola loads the previous commit message into the commit message editor when this option is selected.

The :ref:`Status <status>`_ tool will display all of the changes for the amended commit.

Keyboard Shortcuts

git cola has many useful keyboard shortcuts.

Learn about them by either pressing the ? key, choosing Help -> Keyboard shortcuts from the main menu, or by consulting the git cola keyboard shortcuts reference.

Drag and Drop git am

Dragging and dropping patches onto the git cola interface applies patches using git am.

You can drag either a set of patches or a directory containing patches. All files are sorted alphanumerically before being applied. This means that patches named 0001-foo.patch are applied before 0002-bar.patch.

When a directory is dropped git cola walks the directory tree in search of patches. git cola sorts the list of patches after they have all been found. This allows you to control the order in which patchs are applied by placing patchsets into alphanumerically-sorted directories.

Custom GUI Layouts

git cola remembers modifications to the layout and arrangement of tools within the git cola interface. Changes are saved and restored at application shutdown/startup.

git cola can be configured to not save custom layouts– simply uncheck the Save Window Settings option in the git cola preferences.

Thanks

git-cola was made possible thanks to the contributions of the following people:

  • Audrius Karabanovas
  • Barry Roberts
  • Boris W
  • Ben Boeckel
  • Christian Jann
  • Daniel King
  • Daniel Fahlke
  • David Aguilar
  • David Martínez Martí
  • Eric Drechsel
  • GIT Hackers
  • Ismael Juma
  • Iulian Udrea
  • Justin Lecher
  • Karl Bielefeldt
  • Kelvie Wong
  • Kevin Kofler
  • Libor Jelinek
  • Mahmoud Hossam
  • Marco Costalba
  • Markus Heidelberg
  • Matthew Levine
  • Michael Geddes
  • Michael Homer
  • Omega Weapon
  • Paolo G. Giarrusso
  • Stefan Naewe
  • Steffen Prohaska
  • Ugo Riboni
  • Uri Okrent

Release Notes

git-cola v1.7.7

Usability, bells and whistles

  • New and improved grep mode lets you instantly find and edit files.
  • New git cola grep standalone mode.
  • Support for passing arguments to the configured editors, e.g. gvim -p This makes it possible to select multiple files in the status window and use Ctrl-e to edit them all at once.
  • Remote operations now prompt on errors only.
  • The Tab key now jumps to the extended description when editing the summary.
  • More shortcut key labels and misc. UX improvements.

Fixes

  • Selecting an item no longer copies its filename to the copy/paste buffer. Ctrl-c or the “Copy” context-menu action can be used instead.

  • The repository monitoring feature on Windows learned to ignore changes within the “.git” directory. Thanks to Andreas Sommer.

    http://github.com/git-cola/git-cola/issues/closed#issue/120

git-cola v1.7.6

Usability, bells and whistles

  • git dag learned to color-code branchy edges. The edge colors change when a new branch is detected, which makes the history much easier to follow. A huge thanks to Uri Okrent for making it happen.
  • New GUI for editing remote repositories.
  • New git cola archive and git cola remote sub-commands.
  • git cola browser learned an ‘Untrack’ command.
  • The diff editor learned to staged/unstaged while amending.
  • The status tool can now scroll horizontally.
  • New git repositories can be created by clicking ‘New’ on the git cola –prompt startup screen.

git-cola v1.7.5

Usability, bells and whistles

  • Auto-completion was added to more tools.
  • git dag is easier to use on smaller displays – the author field elides its text which allows for a more compact display.
  • Selected commits in git dag were made more prominent and easier to see.
  • ‘Create Branch’ learned to fetch remote branches and uses a background thread to do so.
  • User-configured GUI tools are listed alphabetically in the ‘Actions’ menu.
  • The ‘Pull’ dialog remembers the value of the ‘Rebase’ checkbox between invocations.

git-cola v1.7.4.1

Fixes

  • Detect Homebrew so that OS X users do not need to set PYTHONPATH.
  • git dag can export patches again.

git-cola v1.7.4

Usability, bells and whistles

  • The ‘Classic’ tool was renamed to ‘Browser’ and learned to limit history to the current branch.
  • git dag learned about gravatar and uses it to show images for commit authors.
  • git dag learned to use OpenGL for rendering resulting in much faster rendering.
  • More dialogs learned vim-style keyboard shortcuts.
  • The commit message editor learned better arrow key navigation.

git-cola v1.7.3

Usability, bells and whistles

  • git cola learned a few new sub commands:
git cola dag
git cola branch
git cola search
  • Return in the summary field jumps to the extended description.
  • Ctrl+Return is now a shortcut for ‘Commit’.
  • Better French translation for ‘Sign-off’.
  • The ‘Search’ widget now has a much simpler and streamlined user interface.
  • vim-style h,j,k,l navigation shortcuts were added to the DAG widget.
  • git dag no longer prompts for files when diffing commits if the text field contains paths.
  • General user interface and performance improvements.

Fixes

  • The diff viewer no longer changes font size when holding Control while scrolling with the mouse wheel.
  • Files with a typechange (e.g. symlinks that become files, etc.) are now correctly identified as being modified.

Packaging

  • The cola.controllers and cola.views packages were removed.

git-cola v1.7.2

Usability, bells and whistles

  • git cola can now launch sub commands, e.g.:
git cola classic
git cola stash
git cola fetch
git cola push
git cola pull
git cola tag
  • git dag is more responsive when gathering auto-completions.
  • Keyboard shortcuts are displayed when the ‘?’ key is pressed.
  • Various keyboard shortcuts were added for improved usability.
  • The status widget now lists unmerged files before modified files.
  • vim-style h,j,k,l navigation shortcuts were added to the status widget.
  • A ‘Recently Modified Files…’ tool was added.
  • Tools can now be hidden with Alt + # (where # is a keyboard number) and focused with Shift + Alt + #.
  • The syntax highlighting colors for diffs was made less intrusive.
  • The commit message editor was redesigned to have a more compact and keyboard-convenient user interface.
  • Keyboard shortcuts for adding a Signed-off-by (Ctrl + i) and creating a commit (Ctrl + m) were added.
  • The status widget was adjusted to use less screen real-estate.

Fixes

Packaging

  • Create git-dag.pyw in the win32 installer.
  • win32 shortcuts now contain explicit calls to pythonw.exe instead of calling the .pyw file directly.

Deprecated Features

  • The ‘Apply Changes from Branch…’ feature was removed. git dag’s ‘Grab File…’ feature used alongside the index/worktree editor is a simpler alternative.

git-cola v1.7.1.1

Fixes

Packaging

The cola-$version tarballs on github were originally setup to have the same contents as the old tarballs hosted on tuxfamily. The make dist target was changed to write files to a git-cola-$version subdirectory and tarball.

This makes the filenames consistent for the source tarball, the darwin .app tarball, and the win32 .exe installer.

git-cola v1.7.1

Usability, bells and whistles

Fixes

  • Boolean git config settings with no value are now supported (these are not created by git these days but exist in legacy repositories).
  • Unicode branches and tags are supported in the “branch diff” tool.
  • Guard against low-memory conditions and more interrupted system calls.

Packaging

  • Added desktop launchers for git-cola.desktop and git-dag.desktop. This replaces the old cola.desktop, so some adjustments to RPM .spec and debian/ files will be needed.
  • Fixed the darwin app-tarball Makefile target to create relative paths.

Cleanup

  • The –style option was removed. git cola follows the system theme so there’s no need for this option these days.

git-cola v1.7.0

Usability, bells and whistles

Fixes

Packaging

  • Bumped version number to ceil(minimum git version). git cola now requires git >= 1.6.3.
  • Simplified git-cola’s versioning when building from tarballs outside of git. We no longer check for a ‘version’ file at the root of the repository. We instead keep a default version in cola/version.py and use it when git cola’s .git repository is not available.

git-cola v1.4.3.5

Usability, bells and whistles

  • inotify is much snappier and available on Windows thanks to Karl Bielefeldt.
  • New right-click command to add untracked files to .gitignore thanks to Audrius Karabanovas.
  • Stash, fetch, push, and pull usability improvements
  • General usability improvements
  • stderr is logged when applying partial diffs.

Fixes

git-cola v1.4.3.4

Usability, bells and whistles

Fixes

git-cola v1.4.3.3

Usability, bells and whistles

  • The git cola desktop launchers now prompt for a repo by default. This is done by using the new –prompt flag which tells git cola to ignore any git repositories in the current directory and prompt for one instead.

Fixes

  • More Unicode fixes for repositories and home directories with embedded unicode characters. Thanks to Christian Jann for patience and helpful bug reports.
  • Fix the ‘Clone’ button in the startup dialog.

git-cola v1.4.3.2

Usability, bells and whistles

  • Faster startup time! git cola now offloads initialization to a background thread so that the GUI appears almost instantly.
  • Specialized diff options for p4merge, vimdiff, araxis, emerge, and ecmerge in difftool (backported from git.git).

Fixes

git-cola v1.4.3.1

Usability, bells and whistles

  • The cola classic tool can be now configured to be dockable.

    http://github.com/git-cola/git-cola/issues/closed#issue/56

  • The cola classic tool now uses visual sigils to indicate a file’s status. The idea and icons were provided by Uri Okrent.

  • Include the ‘Rescan’ button in the ‘Actions’ widget regardless of whether inotify is installed.

Packaging

  • Fix installation of translations per Fedora This incorporates Fedora’s fix for the translations path which originally appeared in cola-1.4.3-translations.patch.
  • Mac OS X git-cola developers can now generate git-cola.app application bundles using ‘make app-bundle’.

Fixes

git-cola v1.4.3

Usability, bells and whistles

  • git dag now has a separate display area for displaying commit metadata. This area will soon grow additional functionality such as cherry-picking, branching, etc.

Fixes

  • Fixed tests from a previous refactoring.

  • Guard against ‘diff.external’ configuration by always calling ‘git diff’ with the ‘–no-ext-diff’ option.

    http://github.com/git-cola/git-cola/issues/closed#issue/67

  • Respect ‘gui.diffcontext’ so that cola’s diff display shows the correct number of context lines.

  • Raise the GUI so that it is in the foreground on OS X.

Packaging

  • We now allow distutils to rewrite cola’s shebang line. This allows us to run on systems where “which python” is Python3k. This is exposed by setting the PYTHON Makefile variable to the location of python2.x.

  • git-cola.app is now a tiny download because it no longer contains Qt and PyQt. These libraries are provided as a separate download.

    http://code.google.com/p/git-cola/downloads/list

git-cola v1.4.2.5

Usability, bells and whistles

  • Clicking on paths in the status widget copies them into the copy/paste buffer for easy middle-clicking into terminals.
  • Ctrl+C in diff viewer copies the selected diff to the clipboard.

Fixes

Packaging

  • Removed hard-coded reference to lib/ when calculating Python’s site-packages directory.

git-cola v1.4.2.4

Usability, bells and whistles

  • Removed “single-click to (un)stage” in the status view. This is a usability improvement since we no longer perform different actions depending on where a row is clicked.
  • Added ability to create unsigned, annotated tags.

Fixes

  • Updated documentation to use cola.git instead of cola.gitcmd.

git-cola v1.4.2.3

Usability, bells and whistles

Fixes

git-cola v1.4.2.2

Usability, bells and whistles

  • git dag interaction was made faster.

Fixes

git-cola v1.4.2.1

Usability, bells and whistles

Portability

  • Added cola.compat.hashlib for Python 2.4 compatibility
  • Improved PyQt 4.1.x compatibility.

Fixes

  • Configured menu actions use sh -c for Windows portability.

git-cola v1.4.2

Usability, bells and whistles

  • Added support for the configurable guitool.<tool>.* actions as described in git-config(1).

    http://github.com/git-cola/git-cola/issues/closed#issue/44

    http://schacon.github.com/git/git-config.html

    This makes it possible to add new actions to git cola by simply editing ~/.gitconfig. This implements the same guitool support as git gui.

  • Introduced a stat cache to speed up git config and repository status checks.

  • Added Alt-key shortcuts to the main git cola interface.

  • The Actions dock widget switches between a horizontal and vertical layout when resized.

  • We now use git diff --submodule for submodules (used when git >= 1.6.6).

  • The context menu for modified submodules includes an option to launch git cola.

    http://github.com/git-cola/git-cola/issues/closed#issue/17

  • Prefer $VISUAL over $EDITOR when both are defined. These are used to set a default editor in lieu of core.editor configuration.

  • Force the editor to be gvim when we see vim. This prevents us from launching an editor in the (typically unattached) parent terminal and creating zombie editors that cannot be easily killed.

  • Selections are remembered and restored across updates. This makes the partial-staging workflow easier since the diff view will show the updated diff after staging.

  • Show the path to the current repository in a tooltip over the commit message editor.

    http://github.com/git-cola/git-cola/issues/closed#issue/45

  • Log internal git commands when GIT_COLA_TRACE is defined.

    http://github.com/git-cola/git-cola/issues/closed#issue/39

Fixes

  • Improved backwards compatibility for Python 2.4.

  • Review mode can now review the current branch; it no longer requires you to checkout the branch into which the reviewed branch will be merged.

  • Guard against color.ui = always configuration when using git log by passing --no-color.

  • yes and no are now supported as valid booleans by the git config parser.

  • Better defaults are used for fetch, push, and pull..

    http://github.com/git-cola/git-cola/issues/closed#issue/43

Packaging

  • Removed colon (:) from the applilcation name on Windows

    http://github.com/git-cola/git-cola/issues/closed#issue/41

  • Fixed bugs with the Windows installer

    http://github.com/git-cola/git-cola/issues/closed#issue/40

  • Added a more standard i18n infrastructure. The install tree now has the common share/locale/$lang/LC_MESSAGES/git-cola.mo layout in use by several projects.

  • Started trying to accomodate Mac OSX 10.6 (Snow Leopard) in the darwin/ build scripts but our tester is yet to report success building a .app bundle.

  • Replaced use of perl in Sphinx/documentation Makefile with more-portable sed constructs. Thanks to Stefan Naewe for discovering the portability issues and providing msysgit-friendly patches.

git-cola v1.4.1.2

Usability, bells and whistles

  • It is now possible to checkout from the index as well as from HEAD. This corresponds to the Removed Unstaged Changes action in the Repository Status tool.
  • The remote dialogs (fetch, push, pull) are now slightly larger by default.
  • Bookmarks can be selected when git cola is run outside of a git repository.
  • Added more user documentation. We now include many links to external git resources.
  • Added git dag to the available tools. git dag is a node-based DAG history browser. It doesn’t do much yet, but it’s been merged so that we can start building and improving upon it.

Fixes

  • Fixed a missing import when showing right-click actions for unmerged files in the Repository Status tool.
  • git update-index --refresh is no longer run everytime git cola version is run.
  • Don’t try to watch non-existant directories when using inotify.
  • Use git rev-parse --symbolic-full-name plumbing to find the name of the current branch.

Packaging

  • The Makefile will now conditionally include a config.mak file located at the root of the project. This allows for user customizations such as changes to the prefix variable to be stored in a file so that custom settings do not need to be specified every time on the command-line.
  • The build scripts no longer require a .git directory to generate the builtin_version.py module. The release tarballs now include a version file at the root of the project which is used in lieu of having the git repository available. This allows for make clean && make to function outside of a git repository.
  • Added maintainer’s make dist target to the Makefile.
  • The built-in simplejson and jsonpickle libraries can be excluded from make install by specifying the standalone=true make variable. For example, make standalone=true install. This corresponds to the --standalone option to setup.py.

git-cola v1.4.1.1

Usability, bells and whistles

  • We now use patience diff by default when it is available via git diff –patience.
  • Allow closing the cola classic tool with Ctrl+W.

Fixes

  • Fixed an unbound variable error in the push dialog.

Packaging

  • Don’t include simplejson in MANIFEST.in.
  • Update desktop entry to read Cola Git GUI.

git-cola v1.4.1

This feature release adds two new features directly from git cola’s github issues backlog. On the developer front, further work was done towards modularizing the code base.

Usability, bells and whistles

Portability

  • git cola is once again compatible with PyQt 4.3.x.

Developer

  • cola.gitcmds was added to factor out git command-line utilities
  • cola.gitcfg was added for interacting with git config
  • cola.models.browser was added to factor out repobrowser data
  • Added more tests

git-cola v1.4.0.5

Fixes

  • Fix launching external applications on Windows
  • Ensure that the amend checkbox is unchecked when switching modes
  • Update the status tree when amending commits

git-cola v1.4.0.4

Packaging

  • Fix Lintian warnings

git-cola v1.4.0.3

Fixes

  • Fix X11 warnings on application startup

git-cola v1.4.0.2

Fixes

git-cola v1.4.0.1

Fixes

git-cola v1.4.0

This release focuses on a redesign of the git-cola user interface, a tags interface, and better integration of the cola classic tool. A flexible interface based on configurable docks is used to manage the various cola widgets.

Usability, bells and whistles

  • New GUI is flexible and user-configurable
  • Individual widgets can be detached and rearranged arbitrarily
  • Add an interface for creating tags
  • Provide a fallback SSH_ASKPASS implementation to prompt for SSH passwords on fetch/push/pull
  • The commit message editor displays the current row/column and warns when lines get too long
  • The cola classic tool displays upstream changes
  • git cola –classic launches cola classic in standalone mode
  • Provide more information in log messages

Fixes

  • Inherit the window manager’s font settings
  • Miscellaneous PyQt4 bug fixes and workarounds

Developer

  • Removed all usage of Qt Designer .ui files
  • Simpler model/view architecture
  • Selection is now shared across tools
  • Centralized notifications are used to keep views in sync
  • The cola.git command class was made thread-safe
  • Less coupling between model and view actions
  • The status view was rewritten to use the MVC architecture
  • Added more documentation and tests

git-cola v1.3.9

Usability, bells and whistles

  • Added a cola classic tool for browsing the entire repository
  • Handle diff expressions with spaces
  • Handle renamed files

Portability

  • Handle carat ^ characters in diff expressions on Windows
  • Worked around a PyQt 4.5/4.6 QThreadPool bug

Documentation

  • Added a keyboard shortcuts reference page
  • Added developer API documentation

Fixes

  • Fix the diff expression used when reviewing branches
  • Fix a bug when pushing branches
  • Fix X11 warnings at startup
  • Fix more interrupted system calls on Mac OS X

git-cola v1.3.8

Usability, bells and whistles

  • Fresh and tasty SVG logos
  • Added Branch Review mode for reviewing topic branches
  • Added diff modes for diffing between tags, branches, or arbitrary git diff expressions
  • The push dialog selects the current branch by default. This is in preparation for git 1.7.0 where unconfigured git push will refuse to push when run without specifying the remote name and branch. See the git release notes for more information
  • Support open and clone commands on Windows
  • Allow saving cola UI layouts
  • Re-enabled double-click-to-stage for unmerged entries. Disabling it for unmerged items was inconsistent, though safer.
  • Show diffs when navigating the status tree with the keyboard

Packaging

  • Worked around pyuic4 bugs in the setup.py build script
  • Added Mac OSX application bundles to the download page

git-cola v1.3.7

Subsystems

  • git difftool became an official git command in git 1.6.3.
  • git difftool learned –no-prompt / -y and a corresponding difftool.prompt configuration variable

Usability, bells and whistles

  • Warn when non-fast-forward is used with fetch, push or pull
  • Allow Ctrl+C to exit cola when run from the command line

Fixes

  • Support Unicode font names
  • Handle interrupted system calls

Developer

  • PEP-8-ified more of the cola code base
  • Added more tests

Packaging

git-cola v1.3.6

Subsystems

  • Added support for Kompare in git difftool
  • Added a separate configuration namespace for git difftool
  • Added the diff.tool configuration variable to define the default diff tool

Usability, bells and whistles

  • The stash dialog allows passing the –keep-index option to git stash
  • Amending a published commit warns at commit time
  • Simplified the file-across-revisions comparison dialog
  • origin is selected by default in fetch/push/pull
  • Removed the search field from the log widget
  • The log window moved into a drawer widget at the bottom of the UI
  • Log window display can be configured with cola.showoutput = {never, always, errors}. errors is the default.
  • NOTE – cola.showoutput was removed with the GUI rewrite in 1.4.0.

Developer

  • Improved nose unittest usage

Packaging

  • Added a Windows/msysGit installer
  • Included private versions of simplejson and jsonpickle for ease of installation and development

Indices and tables