We are proud to announce the official release of SmartGit/Hg 5. The most important new features are GitHub pull requests and comments and Issue linking. Check out What’s New for a more detailed list of improvements in version 5.
SmartGit/Hg is a graphical front-end for the distributed version control systems Git and Mercurial, which also can be used to work with Subversion repositories. SmartGit/Hg runs on Windows, Mac OS X and Linux.
SmartGit/Hg can be used free of charge for non-commercial purposes (e.g. OpenSource developers). For commercial use or if support is needed, you can purchase a commercial license. The commercial license includes 1 year of free updates and either 90 days or 1 year of e-mail support.
- GitHub support for comments and pull-requests, 2-factor-authenticaton
- Git: bugtraq properties to convert issue IDs to links
- Git Log: ability to push/fetch, drag and drop
- Git: assume-unchanged support
- Hg: Annotate and Shelves
You are welcome to give it a try!
If you want to use SmartSynchronize as merge tool for Git, you need to configure the ~/.gitconfig (or .git/config) similarly:
[merge] tool = smartsynchronize [mergetool "smartsynchronize"] cmd = '/C/Program Files/tom/SmartSynchronize/bin/smartsynchronize.exe' "$LOCAL" "$REMOTE" "$MERGED" trustExitCode = false
Imagine, you need to rename a file makefile to Makefile on OS X or Windows using SmartGit. Simply renaming is not sufficient, because the file is treated as the same (the file systems are case-preserving, but not case-sensitive). So we need a trick:
- rename the file to a temporary name, e.g. makefile to makefile.tmp
- commit the missing makefile and the untracked makefile.tmp
- rename the temporary file to the final name, e.g. makefile.tmp to Makefile
- commit the missing makefile.tmp and the untracked Makefile with the Amend-option selected