Teach difftool and mergetool about the Sublime Merge " smerge" command. (Merged by Junio C Hamano - gitster - in commit 5116eab, ) mergetools: add support for smerge (Sublime Merge) See commit f57b2ae, commit eb12adc () by David Aguilar ( davvid). This is extremely useful by itself, but unfortunately indents file names paths by the size of an icon. Usage: git config -global merge.tool smergeĪnd then just git mergetool or git difftool. But current version of Sublime Merge marks newly added and deleted files with special icons. With Git 2.22 (Q2 2019), that will be easier, since the configuration will be done for you, and " git mergetool" learned to offer Sublime Merge ( smerge) as one of its backends.Īs commented in SublimeTextIssues/Merge issue 19: In addition to using Sublime Merge, mentioned above, you can invoke it directly with git difftool now. Try them out, and see what works for you. But, it's not open-source, and costs extra money to use long-term.Īny of these will work with Github, Bitbucket, or any other public or private repo that uses the git protocol. It includes a number of syntax definitions for editing commit messages, looking at diffs, comparing branches, etc., and judging by its popularity (it's one of the Top 100 at Package Control) a lot of people seem to like it. SublimeGit is a free-to-try, € 10 to buy commercial plugin (available through Package Control) that looks like it's very full-featured, allowing you to do just about anything related to git. The result is, to us at least, something pretty special. Another popular tool is Git, which provides essentially the same options as SideBarGit, just in a menu off Tools instead. It combines the UI engine of Sublime Text, with a from-scratch implementation of Git. I use SideBarGit (along with SideBarEnhancements), which allows you to right-click on a file in your project and get access to the whole array of git-related tasks, from Add & Commit & Push to Branch to Clone to Diff and more. There are numerous git plugins available via Package Control, so all you have to do is browse through them, read the READMEs, and decide if you want to try it out.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |