Conflict Solver
The Conflict Solver is a built-in 3-way-merge tool that helps you to resolve conflicts.
For better understanding the independent changes in complex conflicts you can show the base-file-changes, too.
Learn moreJournal - Distraction-free Log
The “Journal” view shows the commits of the current branch, its tracked branch and one optional auxiliary branch.
It helps focussing on the work with the current branch without being distracted by unrelated commits or less important commit connections. Most branch-related commands, like Merge, Cherry-Pick and Reset, work for the Journal.
For a broader view of the repository’s history, the full-featured Log still is available.
Issue-Linking
SmartGit supports an issue tracker ID to URL conversion configurable similar to SVN’s bugtraq:* properties. More information you can find at github.com/mstrap/bugtraq .
JIRA Integration
When committing files, you may select open issues from Atlassian’s JIRA and use it as commit message.
When pushing commits, SmartGit will determine affected commits and offer to resolve them for a certain version in JIRA.
Spell Checker for Commit Messages
SmartGit ships with an US-English dictionary, but you can configure different dictionaries to be used. SmartGit supports the same dictionary file format as OpenOffice or LibreOffice. If multiple dictionaries are configured, the best matching one will be used automatically.
Push to Gerrit
Push To Gerrit provides a quick way to push your current branch
<branch> to refs/for/<branch> on your Gerrit server. This operation will only be available if SmartGit has detected that one of your remotes is actually connected to Gerrit.BitBucket and Atlassian Stash
BitBucket and Atlassian Stash are now supported with pull requests and comments, similar to GitHub.
GitLab Hosting Provider
Easily clone your GitLab repositories. You may use your https://gitlab.com account or your private GitLab installation.
Support for Git-LFS
The status of GIT-LFS-managed files is showing up.
External Tools
External Tools can be configured to work on commits. Such tools will be available, both in the Branches view and in the Log Graph. There are new variables available to ask for a file or directory name and a customizable confirmation dialog can be optionally displayed before invoking a tool.
Stash on Demand
If pulling or checking out a branch fails because of local modifications, the changes can be stashed away easily and applied again after the successful command execution.
