share/sublime-merge/Packages/Groovy.sublime-package.share/sublime-merge/Packages/Go.sublime-package.share/sublime-merge/Packages/Git Formats.sublime-package.share/sublime-merge/Packages/Erlang.sublime-package.share/sublime-merge/Packages/Default.sublime-package.share/sublime-merge/Packages/Default - Merge.sublime-package.share/sublime-merge/Packages/D.sublime-package.
share/sublime-merge/Packages/ActionScript.sublime-package.share/sublime-merge/Packages/ASP.sublime-package.share/sublime-merge/Icon/48x48/sublime-merge.png.share/sublime-merge/Icon/32x32/sublime-merge.png.share/sublime-merge/Icon/256x256/sublime-merge.png.share/sublime-merge/Icon/16x16/sublime-merge.png.share/sublime-merge/Icon/128x128/sublime-merge.png.share/icons/hicolor/48x48/apps/sublime-merge.png.share/icons/hicolor/32x32/apps/sublime-merge.png.share/icons/hicolor/16x16/apps/sublime-merge.png.share/icons/hicolor/128x128/apps/sublime-merge.png./usr/local/share/licenses/sublime-merge-2060/SUBLIMEHQ./usr/local/share/licenses/sublime-merge-2060/LICENSE./usr/local/share/licenses/sublime-merge-2060/catalog.mk.WWW: ¦ ¦ ¦ ¦ pkg-plist: as obtained via: make generate-plist Expand this list (78 items) Collapse this list. Sublime Merge wraps around theĬore Git functionality, so when you're using Sublime Merge, you're using Git. Highlighting engine used in Sublime Text. It is powered by the same performant cross-platform GUI toolkit and syntax Maintainer: Port Added: 03:00:16 Last Update: 00:05:05 Commit Hash: 043a0f0 Also Listed In: linux License: SUBLIMEHQ Description: Sublime Merge is a Graphical Git Client from the creators of Sublime Text. Sublime-merge Cross-platform Git client, done the Sublime Text wayĢ060 devel =0 Version of this port present on the latest quarterly branch. Want a good read? Try FreeBSD Mastery: Jails (IT Mastery Book 15) Teach difftool and mergetool about the Sublime Merge " smerge" command.FreshPorts - devel/sublime-merge: Cross-platform Git client, done the Sublime Text wayĪs an Amazon Associate I earn from qualifying purchases. (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). Usage: git config -global merge.tool smergeĪnd then just git mergetool or git difftool. 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. Another popular tool is Git, which provides essentially the same options as SideBarGit, just in a menu off Tools instead. 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 kommentar(er)
