This add-on installs a full-fledged Git Client in Oxygen, contributing several side-views that are each specialized for a particular set of Git operations (the main one is the Git Staging view). With our client you can commit changes to the local repository, push and pull to and from remotes, create, check out, and delete branches, browse the history of your files, and more. It also includes a built-in tool for comparing and merging changes.

What's new in version 6.0.0

Conflict resolution

1. AI-assisted conflict resolution — Conflicts are the part of Git most people dread. Hand a conflicting file to Oxygen AI Positron with the new Resolve with AI action, review the suggested resolution, and apply it only when you're happy.
2. Never stuck mid-operation — When a merge, rebase, cherry-pick, or revert stops for conflicts, the Staging panel shows a clear status label and the right controls (Abort / Continue / Restart), and the History graph marks the commits involved.

Richer History view

1. Uncommitted changes on the graph — Pending working-tree changes now appear as a node at the top of the commit graph, joined by a dashed line to HEAD (or to both parents during a merge). Select it to review your staged and unstaged files and to stage, unstage, or discard them without leaving the History view.
2. Compare any two points in history — Select two revisions to see the accumulated diff between them, or select the uncommitted-changes row together with a revision to see everything you've changed since that point.
3. Rebase onto a commit — A new Rebase... action rebases the current branch onto any selected commit without leaving the IDE; a confirmation guards against accidents, and conflicts can be continued or aborted from the Git Staging panel.
4. Smarter checkout — The checkout dialog offers local branches at the selected commit, pre-fills the new branch name from any remote reference, and sets up remote tracking automatically.
5. Interactive graph and toolbar — Double-click a branch label to switch to it, or right-click for quick actions (Go to tracking branch, Delete, Show in Branch Manager); the checked-out branch is tinted so you can spot it at a glance. The toolbar shows the working copy, branch, and filtered file — click the branch to jump to it in the graph, or the X by the file to clear the filter.
6. Richer commit details — The description pane now lists all branches and tags pointing at the selected commit, and shows the committer date when it differs from the author date (for example, after a rebase or cherry-pick).
7. Better blame — Blame gains a Hide Blame action, and clicking a line correctly selects its commit in the History view, while also filtering the history to the corresponding file.

Remotes and branches

1. Explicit Fetch action — A new Fetch action in the Git menu and the Staging panel ellipsis menu fetches all configured remotes and refreshes the History panel and the Branch Manager.
2. Pull and Push in more places — Pull and Push are now on the History panel's HEAD commit menu and the Branch Manager branch menu, so you can sync without switching to the Staging panel.
3. Branch Manager improvements — The Branch Manager now fetches automatically when you open or refresh it, so new remote branches appear on their own, and the outdated-branch check is now opt-out.

Everyday improvements

1. Partial stash — Stash just the files you select in the staging area — optionally including untracked files — instead of shelving the entire working copy.
2. Ignore files and folders — Right-click an untracked file to add it, all files with its extension, or its parent folder to the project .gitignore, or open the global ignore file for manual edits.
3. Take control of your credentials — A new Credentials page under Preferences > Git lets you review and remove stored credentials one host at a time instead of wiping them all, and the login dialog remembers the type and username you used before.
4. Customizable AI commit messages and explanations — Tailor how AI writes your commit messages and explains commits with your own instructions in the preferences, and save them in an Oxygen project file to share conventions across the team.
5. Visual image comparison — Comparing image files now opens a true side-by-side image comparison (newer version on the left, older on the right) instead of a text diff.
6. Path-collision warning — On file systems that ignore letter case or accents (such as macOS), the Staging panel now warns you when two tracked files would collide, so you can fix it before committing instead of losing changes later.

Using the plugin

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

For more information about how to use the Git Client, see the Git Client Add-on docs.