2.1.1 20.1+ plugin Syncro Soft Git Client Git Client

This add-on contributes a built-in Git client directly into Oxygen in the form of a Git Staging view that includes various actions that perform common Git commands, such as push, pull, change branch, commit, and more. It also includes a built-in tool for comparing and merging changes.

What's new in version 2.1.1

  1. Fixed a bug where the Text/Author page contextual menu was not shown when the opened document was remote (e.g. from a WebDAV server).

What's new in version 2.1.0

  1. Updated the JGit library to version 5.6.
  2. Added a "Clear history" action in the working copies combo box.
  3. Added the "Show history" and "Show blame" actions to the contextual menus of the resources from the Project view and of the Text and Author editor pages.
  4. Implemented renaming detection in the Git History view. Renamed resources are presented using a suggestive icon (containing the "R" letter). All the actions from the Git History view take into account the entire history of a resource, including renames and path changes.
  5. Numerous bug fixes and small improvements.

What's new in version 2.0.0

  1. Added a new Git History side-view, available from the toolbar for the entire repository, or from the contextual menu for each unstaged resource.
  2. Added a Show blame action in the contextual menu of unstaged resources. This action works in conjunction with the Git History side-view, where the revision highlighted in the main editor is selected for presenting more details.
  3. Added a Pull (rebase) action in the toolbar.
  4. Added more 2X icons for high resolution screens.
  5. Fixed UI freeze issues when working with large repositories.
  6. Fixed some UI glitches such as unintended borders, lack of padding, crowded components, etc.
  7. Improved speed when performing various operations, such as committing or changing the repository.
  8. Other small bug fixes.

What's new in version 1.5.2

  1. Updated to JGit version 5.4.2 which comes with various bug fixes: https://projects.eclipse.org/projects/technology.jgit/releases/5.4.2/review
  2. Fixed issue: Oxygen freezes on start-up.
  3. Fixed issue: Opening a Git repository fails with a java.lang.NullPointerException.

What's new in version 1.5.1

  1. Updated to JGit 5.4.0.
  2. Fixed issue: switching between flat mode and tree mode didn't always work.
  3. Fixed issue: authentication through SSH using a passphase was broken in the previous build.
  4. Other bug fixes

What's new in version 1.5.0

  1. Updated to JGit 5.3.1.
  2. The add-on now works with more kinds of SSH keys, by using JGit's new SSH session factory based on 'Apache MINA sshd' by default. See https://wiki.eclipse.org/JGit/New_and_Noteworthy/5.2 for a full list of benefits.
  3. The tooltips of the push/pull buttons and the branch label now also present the remote repository.
  4. Bug fixes
  5. Speed improvements

What's new in version 1.4.0

  1. Update to JGit 5.2.1.
  2. Performance improvements when checking the status of the repository.
  3. Fixed bug that led to file loss when changing the letter case in a file name.
  4. Better error message when the working copy is locked.
  5. When closing, Oxygen will wait for Git commands to complete to avoid possible side effects such as leaving the worky copy locked.

What's new in version 1.3.2

  1. Initalize and update submodules if needed when the user opens a submodule.

What's new in version 1.3.1

  1. Present an error message when Pull fails because local changes would be overwritten by merge.

What's new in version 1.2.11

  1. Various performance optimizations, bug fixes and the ability to check out a specific branch when cloning a repository.

What's new in version 1.2.10

  1. Speed improvement when invoking the contextual menu the Project view.

What's new in version 1.2.9

  1. Fixed various issues encountered while working with resources in the tree view.

What's new in version 1.2.6

  1. Bug fix: The contextual menu didn't show when running Oxygen on Mac OS X (broken in version 1.2.5)
  2. Improved the calculation of pull behind and push ahead counters

What's new in version 1.2.5

  1. Bug fixes
  2. Performance improvements

Using the plugin

Note: After installing the plugin, if the Git Staging view is not visible, you can open it from the Window > Show View menu.

Selecting the working copy

Click the Browse button to select a working copy from your file system. The selected folder must be a Git Repository. You can also clone a new repository using a toolbar action.

Unstaged resources area

In the unstaged resources area (the one on top) you will see all the modifications that have occurred since your last commit (files that have been modified, new files and deleted files). Various actions are available in the contextual menu (Open, Open in compare editor).

You can stage all the files by clicking the Stage All button or you can stage some of them by selecting and clicking the Stage Selected button. You can even individually stage each file by clicking the Stage button that appears next to each file.

You can switch from the flat(table) view to a tree view by clicking on the button positioned above area.

Staged resources area

In the staging area you will see all the resources that are ready to be committed. Any files from this area can be unstaged and sent back to the unstaged resources area. The staging area has similar actions with the unstaging area.

Comparing changes and conflict resolution

At any time, if you want to see the differences between the last commit and your current modifications you can double click the file that appears either in the staging or unstaging area and Oxygen's Diff window will appear and highlight the changes.

If the file is in conflict (has been modified both by you and another), Oxygen's Three Way Diff will show a comparison between the local change, the remote change, and the original base revision.

Committing

After staging the files, on the bottom of the view you can input the commit message and commit them into your local repository. For convenience, you can also select one of the previously entered messages.

Push/Pull

To push your local repository changes to the remote one you must click on the Push button from the view's toolbar. To bring the changes from the remote repository into your local one you must click on the Pull button from the same toolbar.