Stage Files, Hunks and Lines with no waiting - Sublime Merge is really, really fast. Ayu is a simple, clean and modern theme with bright colors and comes in three versions. Try them out, and see what works for you. This can be used to open projects in Sublime Merge using the command line. In addition to using Sublime Merge, mentioned above, you can invoke it directly with git difftool now. Sublime Merge installed in your system within Applications folder. 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 this episode we are going to talk about Sublime Merge for about 8 minutes.I don't like Git visual tools very much. Usage: git config -global merge.tool smergeĪnd then just git mergetool or git difftool. When I run git mergetool, the Sublime will opening with four and the current file.
#USE SUBLIME MERGE WITH SUBLIME OFFLINE#
I think sublime merge is pretty awesome, and it bothers me a lot that I have to use others tools (meld merge, winmerge etc.) to do an offline merge (no git repository). See commit f57b2ae, commit eb12adc () by David Aguilar ( davvid). use Sublime as your merge tool: git config -global ' subl -w LOCAL REMOTE ' git config -global false: git. (Merged by Junio C Hamano - gitster - in commit 5116eab, ) mergetools: add support for smerge (Sublime Merge) This is pretty hard to take because sublime merge is definitely capable of doing thatbut this feature is not unlocked. Teach difftool and mergetool about the Sublime Merge " smerge" command.
0 kommentar(er)
